From d025ce8e8371b96f81ac5f3d4552e50909cd073a Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Fri, 20 Oct 2023 16:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dexcel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqg.java  | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java | 2 +-
 .../src/main/java/com/ruoyi/tcZz/domain/TcBzhan.java        | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java   | 2 +-
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDy.java   | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java   | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcGzdt.java | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java        | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcJbmap.java        | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java  | 2 +-
 .../src/main/java/com/ruoyi/tcZz/domain/TcQlzxxddt.java     | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcTtsum.java        | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java   | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWb.java   | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcWlaqzcqy.java     | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWldv.java | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcWlmqfzr.java      | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcWlwmzyz.java      | 6 +++---
 .../src/main/java/com/ruoyi/tcZz/domain/TcWpwzlyqk.java     | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpy.java  | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWz.java   | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqbg.java | 6 +++---
 .../src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java      | 6 +++---
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqyj.java | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java | 2 +-
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZbxq.java | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcZdgzxm.java       | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcZdlyjg.java       | 4 ++--
 .../src/main/java/com/ruoyi/tcZz/domain/TcZdqyml.java       | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java | 4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java | 4 ++--
 38 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqg.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqg.java
index 22c32410..6906aae2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqg.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqg.java
@@ -26,12 +26,12 @@ public class TcAqg extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 单位 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java
index f902ad63..d794079c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java
@@ -26,7 +26,7 @@ public class TcBmtb extends BaseEntity
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 部门名称 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBzhan.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBzhan.java
index 87def060..ee36eb3e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBzhan.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBzhan.java
@@ -25,12 +25,12 @@ public class TcBzhan extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
@@ -45,7 +45,7 @@ public class TcBzhan extends BaseEntity
     private String url;
 
     /** 类型 */
-    @Excel(name = "1.B站 2.小红书",readConverterExp = "1=B站,2=小红书",combo = "1=B站,2=小红书")
+    @Excel(name = "1.B站 2.小红书",readConverterExp = "1=B站,2=小红书",combo = "B站,小红书")
     @ApiModelProperty(value = "1.B站 2.小红书,1=B站,2=小红书")
     private Long type;
 }
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 fee77d0e..0079d251 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
@@ -36,7 +36,7 @@ public class TcCy extends BaseEntity
 
     /** 区域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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @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/TcDbdw.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java
index d1ec0875..02c04c64 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java
@@ -26,7 +26,7 @@ public class TcDbdw extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 单位名称 */
@@ -101,7 +101,7 @@ public class TcDbdw extends BaseEntity
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java
index 592ee5de..31d683ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java
@@ -29,7 +29,7 @@ public class TcDbxt extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 系统名称 */
@@ -123,7 +123,7 @@ public class TcDbxt extends BaseEntity
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDy.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDy.java
index 8c77044e..2d5eedf1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDy.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDy.java
@@ -25,12 +25,12 @@ public class TcDy extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java
index 57eef4e5..adb55bb2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java
@@ -28,17 +28,17 @@ public class TcFb extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 类型 */
     @ApiModelProperty(value = "类型,1=上级媒体,2=本地发布")
-    @Excel(name = "类型",readConverterExp = "1=上级媒体,2=本地发布",combo = "1=上级媒体,2=本地发布")
+    @Excel(name = "类型",readConverterExp = "1=上级媒体,2=本地发布",combo = "上级媒体,本地发布")
     private Long type;
 
     /** 标题 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcGzdt.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcGzdt.java
index d7bf1fc7..9e55498a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcGzdt.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcGzdt.java
@@ -25,12 +25,12 @@ public class TcGzdt extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java
index ba82019d..08f444e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java
@@ -26,12 +26,12 @@ public class TcIdcdw extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** lDC名称 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJbmap.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJbmap.java
index a4213cd5..86af5602 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJbmap.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJbmap.java
@@ -27,12 +27,12 @@ public class TcJbmap extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
@@ -63,7 +63,7 @@ public class TcJbmap extends BaseEntity
     private String content;
 
     /** 是否处置 */
-    @Excel(name = "1.未处置 2.已处置",readConverterExp = "1=未处置,2=已处置",combo = "1=未处置,2=已处置")
+    @Excel(name = "1.未处置 2.已处置",readConverterExp = "1=未处置,2=已处置",combo = "未处置,已处置")
     @ApiModelProperty(value = "1.未处置 2.已处置,1=未处置,2=已处置")
     private Long state;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
index 27e4d21b..55c9d56e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
@@ -26,12 +26,12 @@ public class TcJgdw extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 单位名称 */
@@ -66,7 +66,7 @@ public class TcJgdw extends BaseEntity
 
     /** 记录类型 */
     @ApiModelProperty(value = "记录类型,1=监管单位,2=网站监测")
-    @Excel(name = "记录类型",readConverterExp = "1=监管单位,2=网站监测",combo = "1=监管单位,2=网站监测")
+    @Excel(name = "记录类型",readConverterExp = "1=监管单位,2=网站监测",combo = "监管单位,网站监测")
     private Long type;
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java
index 77ecaefe..9683ac4e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java
@@ -38,6 +38,6 @@ public class TcMap extends BaseEntity
 2.国内
  */
     @ApiModelProperty(value = "类型,1=国际,2=国内")
-    @Excel(name = "类型",readConverterExp = "1=国际,2=国内",combo = "1=国际,2=国内")
+    @Excel(name = "类型",readConverterExp = "1=国际,2=国内",combo = "国际,国内")
     private Long type;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcQlzxxddt.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcQlzxxddt.java
index f5c99b7c..34e58cfa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcQlzxxddt.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcQlzxxddt.java
@@ -25,12 +25,12 @@ public class TcQlzxxddt extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java
index 67e27f4a..6e35fc98 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java
@@ -26,12 +26,12 @@ public class TcSdtb extends BaseEntity
 
     /** 属地名称 */
     @ApiModelProperty(value = "属地名称,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "属地名称",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "属地名称",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private Long area;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 文件名称 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java
index 323c13ee..150bfc1d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java
@@ -26,17 +26,17 @@ public class TcSjly extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 类型 */
     @ApiModelProperty(value = "类型,1=硬探针,2=软探针")
-    @Excel(name = "类型",readConverterExp = "1=硬探针,2=软探针",combo = "1=硬探针,2=软探针")
+    @Excel(name = "类型",readConverterExp = "1=硬探针,2=软探针",combo = "硬探针,软探针")
     private Long type;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 资产名称 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java
index ea7e8c90..ca0f2cd2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java
@@ -26,12 +26,12 @@ public class TcTbcz extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 单位名称 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTtsum.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTtsum.java
index f19dbd8d..ec19553e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTtsum.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTtsum.java
@@ -25,12 +25,12 @@ public class TcTtsum extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
@@ -45,7 +45,7 @@ public class TcTtsum extends BaseEntity
     private String intro;
 
     /** 类型 */
-    @Excel(name = "1.今日头条 2.快手",readConverterExp = "1=今日头条,2=快手",combo = "1=今日头条,2=快手")
+    @Excel(name = "1.今日头条 2.快手",readConverterExp = "1=今日头条,2=快手",combo = "今日头条,快手")
     @ApiModelProperty(value = "1.今日头条 2.快手,1=今日头条,2=快手")
     private Long type;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java
index cd70f125..a1ec0b04 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcVx.java
@@ -25,12 +25,12 @@ public class TcVx extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWb.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWb.java
index 902ea6bd..f63b253f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWb.java
@@ -25,12 +25,12 @@ public class TcWb extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlaqzcqy.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlaqzcqy.java
index e9c08057..714aaf54 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlaqzcqy.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlaqzcqy.java
@@ -26,12 +26,12 @@ public class TcWlaqzcqy extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 支撑单位 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWldv.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWldv.java
index 6ad80472..cb59d211 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWldv.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWldv.java
@@ -26,12 +26,12 @@ public class TcWldv extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 分类 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlmqfzr.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlmqfzr.java
index 7372c32b..a3e7839b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlmqfzr.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlmqfzr.java
@@ -26,12 +26,12 @@ public class TcWlmqfzr extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 单位 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlwmzyz.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlwmzyz.java
index 6e5e59fa..23c9f3e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlwmzyz.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWlwmzyz.java
@@ -26,12 +26,12 @@ public class TcWlwmzyz extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 姓名 */
@@ -66,6 +66,6 @@ public class TcWlwmzyz extends BaseEntity
 
     /** 志愿者类型 */
     @ApiModelProperty(value = "志愿者类型,1=银龄生活,2=凌云燕")
-    @Excel(name = "志愿者类型",readConverterExp = "1=银龄生活,2=凌云燕",combo = "1=银龄生活,2=凌云燕")
+    @Excel(name = "志愿者类型",readConverterExp = "1=银龄生活,2=凌云燕",combo = "银龄生活,凌云燕")
     private Long type;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpwzlyqk.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpwzlyqk.java
index b2232385..956fc88d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpwzlyqk.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpwzlyqk.java
@@ -26,17 +26,17 @@ public class TcWpwzlyqk extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 类型 */
     @ApiModelProperty(value = "类型,1=本级录用,2=苏州级录用,3=省级及以上录用")
-    @Excel(name = "类型",readConverterExp = "1=本级录用,2=苏州级录用,3=省级及以上录用",combo = "1=本级录用,2=苏州级录用,3=省级及以上录用")
+    @Excel(name = "类型",readConverterExp = "1=本级录用,2=苏州级录用,3=省级及以上录用",combo = "本级录用,苏州级录用,省级及以上录用")
     private Long type;
 
     /** 标题 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpy.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpy.java
index 7c019ff5..e2d4abec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpy.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWpy.java
@@ -26,12 +26,12 @@ public class TcWpy extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 姓名 */
@@ -76,7 +76,7 @@ public class TcWpy extends BaseEntity
 
     /** 网评员类型 */
     @ApiModelProperty(value = "网评员类型,1=核心网评员,2=骨干网评员,3=普通网评员")
-    @Excel(name = "网评员类型",readConverterExp = "1=核心网评员,2=骨干网评员,3=普通网评员",combo = "1=核心网评员,2=骨干网评员,3=普通网评员")
+    @Excel(name = "网评员类型",readConverterExp = "1=核心网评员,2=骨干网评员,3=普通网评员",combo = "核心网评员,骨干网评员,普通网评员")
     private Long type;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWz.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWz.java
index c2ccb188..bdc90200 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWz.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWz.java
@@ -25,12 +25,12 @@ public class TcWz extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java
index a8ba013c..9ce010d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java
@@ -27,12 +27,12 @@ public class TcXtjc extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 单位名称 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqbg.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqbg.java
index 73a405d4..93069a6f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqbg.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqbg.java
@@ -25,17 +25,17 @@ public class TcYqbg 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
     /** 类型 */
-    @Excel(name = "类型",readConverterExp = "1=提示单,2=转办单,3=专报,4=月报,5=深度报告",combo = "1=提示单,2=转办单,3=专报,4=月报,5=深度报告")
+    @Excel(name = "类型",readConverterExp = "1=提示单,2=转办单,3=专报,4=月报,5=深度报告",combo = "提示单,转办单,专报,月报,深度报告")
     @ApiModelProperty(value = "类型,1=提示单,2=转办单,3=专报,4=月报,5=深度报告")
     private Long type;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java
index edcd8bc6..036d882a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java
@@ -27,17 +27,17 @@ public class TcYqxxltj 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
     /** 类型 */
-    @Excel(name = "类型",readConverterExp = "1=本地相关信息,2=本地敏感信息,3=推送预警信息,4=聚焦本地媒体",combo = "1=本地相关信息,2=本地敏感信息,3=推送预警信息,4=聚焦本地媒体")
+    @Excel(name = "类型",readConverterExp = "1=本地相关信息,2=本地敏感信息,3=推送预警信息,4=聚焦本地媒体",combo = "本地相关信息,本地敏感信息,推送预警信息,聚焦本地媒体")
     @ApiModelProperty(value = "类型,1=本地相关信息,2=本地敏感信息,3=推送预警信息,4=聚焦本地媒体")
     private Long type;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqyj.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqyj.java
index a10923fb..4feb3982 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqyj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqyj.java
@@ -27,12 +27,12 @@ public class TcYqyj 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 1.启用 2.禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     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 6fffc914..c0dc7792 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
@@ -29,7 +29,7 @@ public class TcYqzs extends BaseEntity
 
     /** 区域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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private Long areaId;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZbxq.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZbxq.java
index 743fb172..3232afca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZbxq.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZbxq.java
@@ -25,12 +25,12 @@ public class TcZbxq 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdgzxm.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdgzxm.java
index a14751e8..f6635d2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdgzxm.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdgzxm.java
@@ -25,12 +25,12 @@ public class TcZdgzxm extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdlyjg.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdlyjg.java
index de3fa2af..989a2e6c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdlyjg.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdlyjg.java
@@ -25,12 +25,12 @@ public class TcZdlyjg extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdqyml.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdqyml.java
index 7c742584..7b9bc41b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdqyml.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZdqyml.java
@@ -25,12 +25,12 @@ public class TcZdqyml extends BaseEntity
     private Long 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=科教新城")
+    @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "1.启用 2.禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     @ApiModelProperty(value = "1.启用 2.禁用,1=启用,2=禁用")
     private Long isStatus;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java
index 041799ae..1aa503b3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java
@@ -26,12 +26,12 @@ public class TcZfwz extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 网站地址 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java
index fbae270b..ab3abf36 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java
@@ -26,12 +26,12 @@ public class TcZxyh extends BaseEntity
 
     /** 区域 */
     @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
-    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
     private String areaId;
 
     /** 启用/禁用 */
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
     private Long isStatus;
 
     /** 单位名称 */