From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +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 | 9 ++++++++-
1 files changed, 8 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..555de90 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,12 +92,19 @@
private Integer warehousing;
@ExcelProperty("鍙戣揣")
private Integer delivery;
+ @ExcelProperty("鎵撳嵃娆℃暟")
+ private Integer printingNumber;
@ExcelProperty("鍒涘缓鏃ユ湡")
+ @TableField(update = "false")
private LocalDate createTime;
@ExcelProperty("淇敼鏃ユ湡")
private LocalDate updateTime;
+ @ExcelProperty("淇敼鐗堟湰鍙�")
+ private Integer version;
@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