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

yusijie

2024-05-13 79bbf88e61535b5bdbf0e909a0b5c5ae18f8b3d5

 WebAPI/Controllers/BaseSet/Gy_UnitController.cs

@@ -48,7 +48,7 @@
                    return objJsonResult;
                }

                string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 禁用标记='' and 组织名称='" + Organization + "'");
                string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by 计量单位代码 ", "h_v_Gy_UnitList");