From 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 12 九月 2024 17:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java b/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
index 999763e..d7434a4 100644
--- a/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
@@ -85,8 +85,8 @@
}
}
if(customerOrders!=null && customerOrders.size()>0){ //散户订单
+ Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
for (Order order : customerOrders) {
- Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
if(locations!=null && locations.size()>0){
String key = order.getCreateBy()+"||"+order.getCustomerAddress();
WarehouseLocationDTO location = null;
--
Gitblit v1.9.3