From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/OrderGlassDetail.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
index 0f49d25..5d1636a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
@@ -33,13 +33,15 @@
     @TableField(value = "`group`")
     private Integer group;
     private LocalDate productionTime;
+    private Double archRise;
     private LocalDate createTime;
+
+
+    @TableField(select = false,exist = false)
+    private  Integer thickness;
+
    @TableField(select = false,exist = false)
     private  Order order;
-    //@TableField(select = false)
-//   @ManyToOne(fetch = FetchType.LAZY)
     @TableField(select = false,exist = false)
     private OrderDetail  orderDetail;
-
-
 }

--
Gitblit v1.8.0