From 55956e0172d38150ace02bfe972b80841e39920e Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Fri, 27 Oct 2023 15:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E7=BC=96?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/tcZz/domain/TcWljg.java        | 7 +++++--
 1 file changed, 5 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 1c2b8ff8..5a0651f8 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
@@ -31,15 +31,17 @@ public class TcWljg extends BaseEntity {
     /**
      * 区域id
      */
+    //,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城"
     @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 = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城")
+    @Excel(name = "区域id")
     private String areaId;
 
     /**
      * 1.启用 2.禁用
      */
+    //,readConverterExp = "1=启用,2=禁用",combo = "启用,禁用"
     @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
-    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用")
+    @Excel(name = "启用/禁用")
     private Long isStatus;
 
     /**
@@ -90,6 +92,7 @@ public class TcWljg extends BaseEntity {
      * 受攻击IP区域
      */
     @ApiModelProperty(value = "受攻击IP区域")
+    @Excel(name = "受攻击IP区域")
     private String sAttackIpArea;
 
     /**