From f061135c2389dd2cd3dbfc0714fce2cfb876f9b4 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 15 May 2023 13:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E5=AF=BC=E5=87=BA=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcBuildingExcel.java | 4 ++-- .../main/resources/excel/building_export.xlsx | Bin 11696 -> 11676 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java index 52e7a2a435..baf1cdb4a6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java @@ -134,6 +134,6 @@ public class IcBuildingExcel extends ExcelVerifyInfo implements Serializable { @Excel(name = "楼长身份证号") private String buildingLeaderIdCard; - @Excel(name = "楼长类型") - private String buildingLeaderType; +/* @Excel(name = "楼长类型") + private String buildingLeaderType;*/ } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx index d1cad4c5560a387e821cd06056ab4b93983d127f..ba32c961d1359c4a0993a119cadd5a3106ca006a 100644 GIT binary patch delta 5360 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