Merge branch 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program

* 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program:
  project.config.json

# Conflicts:
#	project.config.json

project.config.json

@@ -64,8 +64,13 @@
 				},
 				{
 					"id": -1,
+<<<<<<< HEAD
 					"name": "fcode",
 					"pathName": "pages/fcode/fcode",
+=======
+					"name": "addAddress",
+					"pathName": "pages/addAddress/addAddress",
+>>>>>>> f778d35752c4b95547a4aa0ef9c201110699ad04
 					"query": ""
 				}
 			]