From a8b712bc5b0af9ee6da25e1518729b78aa778fed Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 02 六月 2026 12:07:45 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

---
 src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java |    4 ++++
 1 files changed, 4 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 43409bc..724473a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -47,5 +47,9 @@
     //鍙戣揣鏁伴噺
     private BigDecimal totalQuantity;
 
+    private Long templateId;
+
+    private String templateName;
+
 
 }

--
Gitblit v1.9.3