From 839919c37a00a55bc57b21bcf519a113fcbd37ba Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期六, 22 二月 2025 17:22:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java index 1835e0e..741d6f6 100644 --- a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java +++ b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java @@ -48,6 +48,12 @@ private String projectType; /** + * 椤圭洰绫诲瀷 + */ + @ExcelProperty(value = "椤圭洰瀛愮被鍨�",converter = ExcelEnumConvert.class) + private String projectSubType; + + /** * 椤圭洰鐘舵�� */ @ExcelProperty(value = "椤圭洰鐘舵��",converter = ExcelEnumConvert.class) @@ -192,6 +198,12 @@ private String content; /** + * 寤鸿鎬ц川 + */ + @ExcelProperty(value = "寤鸿鎬ц川") + private String constructionNature; + + /** * 鑱旂郴鏂瑰紡 */ @ExcelProperty(value = "鑱旂郴鏂瑰紡") -- Gitblit v1.8.0