From 6d6ae282ee8a58d6846e7c6986649c474444dae7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 十二月 2025 10:37:46 +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/dto/pp/WorkInProgressDTO.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
index 1e3b104..cfc468d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
@@ -3,6 +3,8 @@
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class WorkInProgressDTO {
@ExcelProperty("宸ュ簭")
@@ -31,10 +33,12 @@
private Double childWidth;
@ExcelProperty("楂�")
private Double childHeight;
+ @ExcelProperty("鍘氬害")
+ private BigDecimal thickness;
@ExcelProperty("搴撳瓨鏁�")
private Integer stockNum;
@ExcelProperty("搴撳瓨闈㈢Н")
- private Double stockArea;
+ private BigDecimal stockArea;
@ExcelProperty("鎴愬搧鍚嶇О")
private String productName;
@ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
@@ -45,4 +49,5 @@
private String glassNumber;
@ExcelProperty("涓婂伐搴忔姤宸ョ彮缁�")
private String teamsGroupsName;
+
}
--
Gitblit v1.8.0