From 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 12 十一月 2024 15:52:32 +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/OrderDetail.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index ce4a702..6596829 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -38,6 +38,7 @@
     private Double archRise;
     private Double weight;
     private Double perimeter;
+    private Double monolithicPerimeter;
     private String otherColumns;
     private Integer warehouseNum;
     private Integer deliveryNum;
@@ -62,6 +63,8 @@
     private String levelTwo;
     @TableField(exist= false)
     private String totalThickness;
+    @TableField(exist= false)
+    private Integer differentSize;//鐢ㄤ簬鏍囩鎵撳嵃鏃�  鏄庣粏鏄惁鏄剧ず
     //private Product product;
 
 }

--
Gitblit v1.8.0