解决冲突

3 months ago · ca4b45c9f7
parent cfab2095ad
commit ca4b45c9f7
1 changed files with 0 additions and 2 deletions
--- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesSortShippingCheckService.java
+++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesSortShippingCheckService.java
@ -39,8 +39,6 @@ public interface IMesSortShippingCheckService {

    void updateDetail(MesShippingOrderManagementDetail item);

-    void saveSecondShipScanOrder(MesSortShippingCheckModel model);
-
    @ApiOperation(value = "待发运列表")
    MesSortShippingCheckModel getSortShippingQueueList(MesSortShippingCheckModel model);