解决合并冲突

5 months ago · d416319260
parent 5e486a0b5b
commit d416319260
1 changed files with 0 additions and 3 deletions
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
@ -123,9 +123,6 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
    private MesMoveRepository moveRepository;

    @Autowired
-    private MesShippingQueueRepository shippingQueueRDao;
-
-    @Autowired
    private IMesConfigService mesConfigService;

    @Autowired