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

zjj

昨天 4114759a57d73661937f28a765fb8a67c017b14b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java

@@ -9,6 +9,7 @@
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
import com.vincent.rsf.server.manager.entity.LocItem;

import java.util.List;

@@ -31,4 +32,5 @@
    R getSiteNos();

    R cancelOutOrderByItems(List<AsnOrderItem> orderItems);

}