From 63e4cafd10417db73f9b6b2db62b90c06a54823e Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Fri, 20 Oct 2023 11:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java   | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java
index e1545b2b..fee77d0e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java
@@ -35,8 +35,8 @@ public class TcCy extends BaseEntity
     private Long cyCount;
 
     /** 区域id */
-    //,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城"
-    @Excel(name = "区域id")
+    //
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java
index 8a8aba37..6fffc914 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java
@@ -28,8 +28,8 @@ public class TcYqzs extends BaseEntity
     private Long id;
 
     /** 区域id */
-    //,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城"
-    @Excel(name = "区域id")
+
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private Long areaId;