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

jhz

2022-07-26 1f49f98a07ae1c31a1967c5c36b382d6c855becd

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -48,6 +48,7 @@
                    string sql = sql1 + sWhere + " order by 仓库代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
                }

                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{
                //    objJsonResult.code = "0";