Merge branch 'master_chujiang_0731' into master_chujiang_0805

@@ -833,9 +833,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         Map<String, String> shipmentsOrderIdMap = new HashMap<>();
         Map<String, List<String>> deptIdMap = new HashMap<>();
         Map<String, List<String>> regionMap = new HashMap<>();
-        List<String> detailIds = new ArrayList<>();
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = new ArrayList<>();
         for (List<ShipmentsPlanDetail> details : batchList) {
+            List<String> detailIds = new ArrayList<>();
             String id = IdUtil.getId();
             String customerId = details.get(0).getCustomerId();
             StringBuilder deliveryTypeBuilder = new StringBuilder();