From 38d8abee8db1034b4cc3fae8613e8328653a1080 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 18 九月 2024 16:07:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 70688b3..4b2afcc 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -274,6 +274,8 @@
dto.setParams(parseArray(oi.getFlowerParams(), ParamItemDTO.class));
+ dto.setNum(oi.getNum());
+
return dto;
}
@@ -309,6 +311,8 @@
dto.setParams(parseArray(oi.getFlowerParams(), ParamItemDTO.class));
+ dto.setNum(oi.getNum());
+
return dto;
}
--
Gitblit v1.9.3