%!s(int64=5) %!d(string=hai) anos · 3f9af0c78a
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 
				 .idea
			
 
				-.DS_Store
			
 
				-mallApp/package.json
			
 
				+.DS_Store
			
--- a/mallApp/src/ext.json
+++ b/mallApp/src/ext.json
@@ -6,6 +6,6 @@
 
				     "account": 12358,
			
 
				     "apiHost": "https://api.shop.theflorist.cn",
			
 
				     "imgHost": "https://img.theflorist.cn",
			
 
				-    "merchantName":"中花卉"
			
 
				+    "merchantName":"中花卉 account请填写门店id"
			
 
				   }
			
 
				 }