Merge branch 'master' of http://192.168.195.14:3000/outsource/WorkCameraf

# Conflicts:
#	manifest.json

common/server.js

@@ -3,7 +3,7 @@ import {
 	post
 } from "./request";
 
-var base_url = "https://wc.zpc-xy.com/";
+var base_url = "http://49.233.115.141:9338/";
 export const getBaseUrl = () => {
 	return base_url;
 }

manifest.json

@@ -1,7 +1,6 @@
 {
-    "name" : "北郊随工相机",
-    "appid" : "__UNI__4E007D7",
-    "description" : "",
+    "name" : "随工水印相机",
+    "appid" : "__UNI__37E1E71",    "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
@@ -120,5 +119,6 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "3"
+    "vueVersion" : "3",
+    "fallbackLocale" : "zh-Hans"
 }