From 0c9ee949b6a7ea8ce2bbc42cbbd2c64fb977e509 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 14:58:39 +0800
Subject: [PATCH] Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_新疆马铃薯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 43409bc..9a68969 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -47,5 +47,12 @@
     //鍙戣揣鏁伴噺
     private BigDecimal totalQuantity;
 
+    //閲囪喘鍚堝悓鍙�
+    private String purchaseContractNumber;
+
+    private Long templateId;
+
+    private String templateName;
+
 
 }

--
Gitblit v1.9.3