From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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 |    4 ++++
 1 files changed, 4 insertions(+), 0 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 b0857bc..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
@@ -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