From 81cad8df0f1b33700e7fc80f271eda7f1180efb0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 6 +++++-
1 files changed, 5 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..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;
@@ -99,8 +99,12 @@
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