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 | 10 ++++++++++
1 files changed, 10 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..9a68969 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,15 @@
//鍏宠仈鐨勫嚭搴撳崟鍙�
private String outboundBatches;
+ //鍙戣揣鏁伴噺
+ private BigDecimal totalQuantity;
+
+ //閲囪喘鍚堝悓鍙�
+ private String purchaseContractNumber;
+
+ private Long templateId;
+
+ private String templateName;
}
--
Gitblit v1.9.3