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

chenhaozhe

2 天以前 7879f7a29945ed155e057d064c867e0839d081dc

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -3446,7 +3446,8 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList order by 条码日期 desc", "h_v_Sc_UnbindStation_BarList");
                    ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList" +
                        " order by 条码日期 desc", "h_v_Sc_UnbindStation_BarList");
                }
                else
                {