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

zzr99

2022-07-08 d4a636d91941498d470ac4c94a3145599cf7429d

 WarM/报表分析/Sc_CJKB.cs

@@ -79,7 +79,7 @@
                //if (frmCondition.SqlStr.Trim().Length == 0)
                //    return;
                //sSql = frmCondition.SqlStr + sWhere + " order by HStatus,HDate   ";
                sSql = "exec h_p_CGKB ";
                sSql = "exec h_p_CJKB ";
                //
                DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
                //鐢熸垚棣栬鏍囬