From b9fa1c266e2d51388a757cf361680d82f6edfbea Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 15:49:59 +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 | 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 b0857bc..abf8760 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
@@ -9,6 +9,7 @@
import lombok.Data;
import java.time.LocalDate;
+import java.util.List;
@Data
@TableName("sd.`order`")
@@ -44,7 +45,7 @@
private String salesman;
@ExcelProperty("閾濇潯鏂瑰紡")
private String alType;
- @ExcelProperty("閲戦")
+ @ExcelProperty("璁㈠崟閲戦")
private Double money;
@ExcelProperty("鍚堝悓缂栧彿")
private String contractId;
@@ -99,8 +100,14 @@
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(select = false,exist = false)
+ private List<String> excludeOrderIds;
@TableField(value = "customer_id")
private Customer customer;
--
Gitblit v1.8.0