解决冲突

client/app.json

@@ -17,14 +17,11 @@
     "pages/servant/servantlist/servantlist",
     "pages/customer/servantlist/servantlist",
     "pages/common/userGuide/userGuide",
-<<<<<<< HEAD
     "pages/servant/servantsettings/servantsettings",
-    "pages/servant/servantedit/servantedit"
-=======
+    "pages/servant/servantedit/servantedit",
     "pages/customer/servantsettings/servantsettings",
     "pages/servant/servantsettings/servantsettings",
     "pages/customer/reportList/reportList"
->>>>>>> 2d162884b1f6b930e03ccf4c2544941431ca5637
   ],
   "window": {
     "defaultTitle": "保姆管家",

client/util/apiUrl1.js

@@ -14,12 +14,7 @@ const selectDayTaskItemPath=baseService+'/servantTask/selectDayTaskItem';
 export default{
 servantappletservicePath,
 insertNewservantappletservicePath,
-<<<<<<< HEAD
 createDayTaskItem,
 getSubjectWhenEdit,
-}
-=======
 selectDayTaskItemPath
 }
-
->>>>>>> 2d162884b1f6b930e03ccf4c2544941431ca5637