Merge remote-tracking branch 'origin/lggslasrs' into lggslasrs

Administrator

3 天以前 c0f81af8caedef1bd514804f505c57f4bf58638e

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -464,6 +464,7 @@
            validComb.add(mesToCombParam);
        }
        for (MesToCombParam mesToCombParam : validComb) {
            mesToCombParam.setBoxType1("ERP");
            openService.mesToComb(mesToCombParam);
        }
        // TODO:待测试