Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

YL

2021-08-18 6c663ed6297530624a7f7df0a24783aee705a5dd

 WebAPI/Controllers/OtherInStockController.cs

@@ -82,7 +82,7 @@
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = oBar;