From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java |    9 +++++----
 1 files changed, 5 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 c4ff1c0..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
@@ -24,6 +24,7 @@
     private Double childHeight;
     private Double area;
     private Double totalArea;
+    private Double arc;//寮ч暱
     private String icon;
     private String process;
     private String productionId;
@@ -33,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