From 70b2f7ec805cd7e1b9173dcb3cad2e407e5bd15d Mon Sep 17 00:00:00 2001
From: ASxx <2075995406@qq.com>
Date: Mon, 21 Aug 2023 18:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E6=8A=A5=E6=96=B0=E5=A2=9E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/zongzhi/domain/TcTb.java   | 65 ++++++++++---------
 .../resources/mapper/zongzhi/TcTbMapper.xml   |  2 +-
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java
index 383a12a..0710a5c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java
@@ -39,6 +39,38 @@ public class TcTb extends BaseEntity {
     @ApiModelProperty(value = "部门名称")
     private String depName;
 
+
+    /**
+     * 目标ip
+     */
+    @Excel(name = "目标ip")
+    @ApiModelProperty(value = "目标ip")
+    private String  ip;
+
+
+    /**
+     * 处置状态 1:已处置 2:为处置
+     */
+    @Excel(name = "处置状态 1:已处置 2:为处置")
+    @ApiModelProperty(value = "处置状态 1:已处置 2:为处置")
+    private int  state;
+
+
+
+    /**
+     * 文件路径
+     */
+    @Excel(name = "文件路径")
+    @ApiModelProperty(value = "文件路径")
+    private String  fileUrl;
+
+
+    /**
+     * 文件名称
+     */
+    @Excel(name = "文件名称")
+    @ApiModelProperty(value = "文件名称")
+    private String  fileName;
     /**
      * 属地名称
      */
@@ -51,7 +83,7 @@ public class TcTb extends BaseEntity {
      */
     @Excel(name = "通报类型:1.属地通报 2.部门通报")
     @ApiModelProperty(value = "通报类型:1.属地通报 2.部门通报")
-    private Long tbType;
+    private int tbType;
 
     /**
      * 通报时间
@@ -77,35 +109,4 @@ public class TcTb extends BaseEntity {
 
 
 
-    /**
-     * 目标ip
-     */
-    @Excel(name = "目标ip")
-    @ApiModelProperty(value = "目标ip")
-    private String  ip;
-
-
-    /**
-     * 处置状态 1:已处置 2:为处置
-     */
-    @Excel(name = "处置状态 1:已处置 2:为处置")
-    @ApiModelProperty(value = "处置状态 1:已处置 2:为处置")
-    private int  state;
-
-
-
-    /**
-     * 文件路径
-     */
-    @Excel(name = "文件路径")
-    @ApiModelProperty(value = "文件路径")
-    private String  fileUrl;
-
-
-    /**
-     * 文件名称
-     */
-    @Excel(name = "文件名称")
-    @ApiModelProperty(value = "文件名称")
-    private String  fileName;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml b/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml
index b470980..5ca83c2 100644
--- a/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml
@@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ip != null">ip,</if>
             <if test="state != null">state,</if>
             <if test="fileUrl != null">file_url,</if>
+            <if test="tbType != null">tb_type,</if>
             <if test="fileName != null">file_name,</if>
             <if test="locationName != null">location_name,</if>
-            <if test="tbType != null">tb_type,</if>
             <if test="tbTime != null">tb_time,</if>
             <if test="createId != null">create_id,</if>
             <if test="createBy != null">create_by,</if>