From 4635770544e2d57416ad88a8983ee293919f5fec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
index 05c41f9..724473a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -8,6 +8,7 @@
import com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -43,6 +44,12 @@
//鍏宠仈鐨勫嚭搴撳崟鍙�
private String outboundBatches;
+ //鍙戣揣鏁伴噺
+ private BigDecimal totalQuantity;
+
+ private Long templateId;
+
+ private String templateName;
}
--
Gitblit v1.9.3