From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 16 ++++++++++++++++
1 files changed, 16 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 9ff3f09..724473a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -5,8 +5,10 @@
import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -36,4 +38,18 @@
private List<StorageBlobDTO> storageBlobDTOs;
private List<StorageBlobVO> storageBlobVOs;
+ private List<Long> batchNo;
+ private List<ShippingProductDetail> batchNoDetailList;
+
+ //鍏宠仈鐨勫嚭搴撳崟鍙�
+ private String outboundBatches;
+
+ //鍙戣揣鏁伴噺
+ private BigDecimal totalQuantity;
+
+ private Long templateId;
+
+ private String templateName;
+
+
}
--
Gitblit v1.9.3