From 15e0cd26d651510fde1aea51cd536b7ea2f377e2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 二月 2025 11:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java b/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java
index 398e299..055eba7 100644
--- a/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java
+++ b/business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java
@@ -27,7 +27,7 @@
@ExcelProperty(value = "涓氫富鍗曚綅")
private String projectOwnerUnit;
- @ExcelProperty(value = "涓荤閮ㄩ棬")
+ @ExcelProperty(value = "椤圭洰涓荤閮ㄩ棬")
private String competentDepartment;
@ExcelProperty(value = "璁″垝寮�宸ユ椂闂�")
@@ -39,9 +39,9 @@
@ExcelProperty("骞村害鎶曡祫閲戦")
private BigDecimal tzje;
- @ExcelProperty("琛屼笟涓荤閮ㄩ棬")
- private String hyzgbm;
+// @ExcelProperty("琛屼笟涓荤閮ㄩ棬")
+// private String hyzgbm;
- @ExcelProperty(value = "琛屾斂鍖哄垝")
+ @ExcelProperty(value = "琛屾斂鍖哄煙")
private String area;
}
--
Gitblit v1.8.0