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

YL

2021-08-03 71a3fc79277e2758fc466bf0a869448d6ad43049

 WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs

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