From 128477234dfccf2b06b608b5569595607d9752cf Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 08 九月 2026 22:46:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

---
 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