Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI

YL

2021-12-31 338a7ef46eddc9f2f0f8f40d17a37a9ef4a844bb

 WebAPI/Controllers/WebAPIController.cs

@@ -183,8 +183,8 @@
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                string sReturn = "测试";
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref sReturn);
                LogService.Write(sReturn);
                LogService.Write(FCusName);
                //LogService.Write(sReturn);
                //LogService.Write(FCusName);
                if (FCusName == "夏宝电器")
                    ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                else