From 3124ce87407fe85f6780b3ba1a219d8d9e8d7475 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十月 2025 13:21:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
index 8a8e685..6f44066 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
@@ -16,6 +16,13 @@
@ExcelMerge(merge = true, isPrimaryKey = true)
private String productDate;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "宸ョ▼鍙�"})
+ private String engineerId;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬荤墖閲�"})
+ private String glassTotal;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬婚潰绉�(m^2)"})
+ private String glassTotalArea;
+
@ExcelProperty(value = {"鍒囧壊", "寮�濮嬫椂闂�"})
@ExcelMerge(merge = true)
private String edgBeginTime;
@@ -87,12 +94,7 @@
@ExcelMerge(merge = true)
private String hollowArea;
- @ExcelProperty(value = {"宸ョ▼淇℃伅", "宸ョ▼鍙�"})
- private String engineerId;
- @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬荤墖閲�"})
- private String glassTotal;
- @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬婚潰绉�(m^2)"})
- private String glassTotalArea;
+
}
--
Gitblit v1.8.0