From bd5d1dae54ea1e42e9e9f0d00f671d95914b105f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 16:54:56 +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/pojo/ShippingInfo.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index f244453..3e06782 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -28,6 +28,10 @@
     @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
 
+    @TableField(exist = false)
+    @Schema(description = "瀹㈡埛id")
+    private Long customerId;
+
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
@@ -67,6 +71,10 @@
     @Excel(name = "鍙戣揣杞︾墝鍙�")
     private String shippingCarNumber;
 
+    @Schema(description = "鍑哄簱鎵瑰彿")
+    @Excel(name = "鍑哄簱鎵瑰彿")
+    private String outboundBatches;
+
     @Schema(description = "鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 

--
Gitblit v1.9.3