From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/excel/TbProjectExcel.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/excel/TbProjectExcel.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/excel/TbProjectExcel.java
index 9701fe2..f795b21 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/excel/TbProjectExcel.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/excel/TbProjectExcel.java
@@ -21,19 +21,15 @@
 	@ExcelProperty("地市")
 	private String  cityName;
 
-	@ExcelIgnore
 	@ExcelProperty("县市区")
 	private String countyName;
 
-	@ExcelIgnore
 	@ExcelProperty("中央投资")
 	private Double centerFund;
 
-	@ExcelIgnore
 	@ExcelProperty("地方投资")
 	private Double localFund;
 
-	@ExcelIgnore
 	@ExcelProperty("填报年份")
 	private String tbYear;
 

--
Gitblit v1.9.3