From a2df53d77fc810df1ee3fbddd70409ca5f54a40b Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Thu, 19 Oct 2023 10:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=86=E6=83=85=E8=B5=B0=E5=8A=BFxml?=
 =?UTF-8?q?=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/TcWljg.java | 2 +-
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java
index b63d285b..c9a0e85f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljg.java
@@ -39,7 +39,7 @@ public class TcWljg extends BaseEntity {
      * 1.启用 2.禁用
      */
     @ApiModelProperty(value = "1.启用 2.禁用")
-    @Excel(name = "1.启用 2.禁用")
+    @Excel(name = "启用/禁用")
     private Long isStatus;
 
     /**
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 0aa02794..8a8aba37 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,7 +28,8 @@ public class TcYqzs extends BaseEntity
     private Long id;
 
     /** 区域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=科教新城")
+    //,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")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private Long areaId;