From 71594bd2dc9201834aa533099e9e49a9b84506cd Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期四, 12 六月 2025 15:32:25 +0800 Subject: [PATCH] 新增韩语 --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 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 89e8ab7..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 @@ -13,8 +13,15 @@ public class DailyProductionData { @ExcelProperty(value = "鏃ユ湡") - @ExcelMerge(merge = true) + @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) @@ -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