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

yxj

2024-09-20 f34c6a21dc58bc0d40a011d6d7366c5eb3f15f15

 WebAPI/Controllers/基础资料/基础资料/Gy_StockPlace_Controller.cs

@@ -37,7 +37,7 @@
            {
                List<object> columnNameList = new List<object>();
          
                string sql1 = string.Format(@"select * from h_v_IF_StockPlaceList_ where 浣跨敤缁勭粐='" + Organization + "'");
                string sql1 = string.Format(@"select top 1000 * from h_v_IF_StockPlaceList_ where 浣跨敤缁勭粐='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HMainID", "h_v_IF_StockPlaceList_");