From 1f97acdb370414caa5303563f6c653a70a0e542b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 28 三月 2025 09:26:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index c3d6de0..a326716 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -32,7 +32,7 @@
private String icon;
@ExcelProperty("鍖呰鏂瑰紡")
private String packType;
- @ExcelProperty("鍙戣揣鍚嶇О")
+ @ExcelProperty("鍙戣揣鏃堕棿")
private LocalDate deliveryDate;
@ExcelProperty("鎵规")
private String batch;
@@ -101,6 +101,8 @@
private LocalDate updateTime;
@TableField(select = false,exist = false)
private Integer goodsQuantity;
+ @TableField(select = false,exist = false)
+ private String timeOut;
@TableField(value = "customer_id")
private Customer customer;
--
Gitblit v1.8.0