From 16338016e73791cecbbdbdd73e972b29a06c59b1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 30 五月 2026 15:24:50 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' 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