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/pojo/ShippingInfo.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index ed9a268..a5616d8 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;
 
@@ -68,7 +72,6 @@
     private String shippingCarNumber;
 
     @Schema(description = "鍒涘缓鏃堕棿")
-    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     @Schema(description = "淇敼鏃堕棿")

--
Gitblit v1.9.3