Merge branch 'master' into storemanagement

BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs

@@ -562,6 +562,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
                         {
                             item2.Id = thisitem.Id;
                             item2.GroupId = thisitem.GroupId;
+                            item2.CreateBy = string.IsNullOrEmpty(item2.CreateBy) ? "" : item2.CreateBy;
                             _db.Updateable(item2).ExecuteCommand();
                         }
                         else

BPA.SAAS.Manage.Web.Entry/Properties/launchSettings.json

@@ -14,7 +14,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5006"
+      "applicationUrl": "http://localhost:5001"
     },
     "Docker": {
       "commandName": "Docker",

BPA.SAAS.Manage.Web.Entry/appsettings.json

@@ -10,7 +10,7 @@
   "AllowedHosts": "*",
   "ConnectionConfigs": [
     {
-      "ConnectionString": "server=10.2.1.21;Database=bpa_kitchen_kitchenbasemanage;Uid=root;Pwd=cygadmin;Allow Zero Datetime=True;Convert Zero Datetime=True;",
+      "ConnectionString": "server=10.2.1.21;Database=bpa_kitchen_storemanageorderbase;Uid=root;Pwd=cygadmin;Allow Zero Datetime=True;Convert Zero Datetime=True;",
       "DbType": "Mysql",
       "IsAutoCloseConnection": true
     }