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

YL

2021-08-27 656833a6a0ff459d5fb167474213dea798a3488c

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -33,11 +33,11 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList " + sWhere, "h_v_MES_StationEntrustInBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList " + sWhere+ " order by 发出时间 desc", "h_v_MES_StationEntrustInBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1 ";
                    string sql1 = "select * from h_v_MES_StationEntrustInBillList where 1 = 1  order by 发出时间 desc";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationEntrustInBillList");
                }