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

zzr99

2021-12-25 9385f2a2e4e2b6578f4b9e1cc139db977c2467ee

 WebAPI/Controllers/BaseSet/Gy_SourceController.cs

@@ -34,11 +34,11 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 禁用标记='' ", "h_v_IF_SourceList");
                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_SourceList where 禁用标记='' ";
                    string sql1 = "select * from h_v_IF_SourceList where 1=1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
                }