From 3c1f9d699497dcfc4b682502945a4ebee4c37e03 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 27 十二月 2024 16:54:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 5 ++++-
1 files changed, 4 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 8221da6..b0857bc 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;
@@ -92,7 +92,10 @@
private Integer warehousing;
@ExcelProperty("鍙戣揣")
private Integer delivery;
+ @ExcelProperty("鎵撳嵃娆℃暟")
+ private Integer printingNumber;
@ExcelProperty("鍒涘缓鏃ユ湡")
+ @TableField(update = "false")
private LocalDate createTime;
@ExcelProperty("淇敼鏃ユ湡")
private LocalDate updateTime;
--
Gitblit v1.8.0