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

沈泽

2021-09-10 356fb43b6b458f33d2c6ba6b13d8729f7f656ea1

 WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs

@@ -33,7 +33,7 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere, "h_v_MES_StationEntrustOutBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList " + sWhere+ " order by 接收时间 desc", "h_v_MES_StationEntrustOutBillList");
                }
                else
                {