手动merge

src/project.config.json

@@ -39,11 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-<<<<<<< HEAD
 			"current": 48,
-=======
-			"current": 47,
->>>>>>> c83b62caec0d0a537ed00897a92dbece954243d9
 			"list": [
 				{
 					"id": -1,
@@ -347,7 +343,6 @@
 					"scene": null
 				},
 				{
-<<<<<<< HEAD
 					"id": -1,
 					"name": "导购首页",
 					"pathName": "shoppingGuid/page/pages/home/home",
@@ -369,11 +364,6 @@
 					"id": -1,
 					"name": "福利",
 					"pathName": "shoppingGuid/page/pages/welfare/welfare",
-					"query": ""
-=======
-					"id": 45,
-					"name": "导购",
-					"pathName": "pages/shopping/home/home",
 					"query": "",
 					"scene": null
 				},
@@ -390,7 +380,6 @@
 					"pathName": "pages/shopping/kpi/kpi",
 					"query": "",
 					"scene": null
->>>>>>> c83b62caec0d0a537ed00897a92dbece954243d9
 				}
 			]
 		}