From f7ca9752b8cc4d81d75a23bbcd89227a2e3abe69 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 07:59:18 +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 | 11 +++++++----
1 files changed, 7 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..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
@@ -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;
@@ -32,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