From 9d80c05bdbc18b4d7778828d411deb9b603f6a4b Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 25 七月 2025 15:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java |    8 ++++----
 1 files changed, 4 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..89c8bf3 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
@@ -34,12 +34,12 @@
     private Integer group;
     private LocalDate productionTime;
     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