From ad6a05f2535c1f29a764f352d8ca666cae1b97d1 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期六, 22 二月 2025 17:06:28 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/project_management-java --- business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 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 510292d..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 = "鑱旂郴鏂瑰紡") @@ -201,7 +213,7 @@ * 椤圭洰涓氫富鍗曚綅 */ @ExcelProperty(value = "椤圭洰涓氫富鍗曚綅") - private String projectOwnerUnit; + private Long projectOwnerUnit; /** * 璁″垝寮�宸ユ椂闂� -- Gitblit v1.8.0