Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json

ZR.Admin.WebApi/appsettings.development.json

@@ -6,7 +6,7 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "urls": "http://localhost:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改
+  "urls": "http://0.0.0.0:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改
   "dbConfigs": [
     {
 
@@ -24,7 +24,7 @@
   //代码生成数据库配置
   "CodeGenDbConfig": {
     //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
-    "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog={dbName};",
+    "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog={dbName};",
     "DbType": 0,
     "IsAutoCloseConnection": true,
     "DbName": "ZrAdmin" //代码生成默认连接数据库