From b9e7a0261443ca41b80108b9fef555093f20bb8b Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 14 十月 2022 16:48:13 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
index 356f2a9..eb69ffa 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -35,7 +35,7 @@
      */
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
 
     /**
      * 浜嬩欢缂栧彿
@@ -57,6 +57,12 @@
     @TableField("category")
     @ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓锛�")
     private Integer category;
+    /**
+     * 闂绫诲埆鏂囨湰
+     */
+    @TableField(value = "category_text",exist = false)
+    @ApiModelProperty(value = "闂绫诲埆鏂囨湰")
+    private String categoryText;
 
     /**
      * 鎵�灞炶閬�
@@ -64,6 +70,12 @@
     @TableField("street_id")
     @ApiModelProperty(value = "鎵�灞炶閬�")
     private Integer streetId;
+    /**
+     * 鎵�灞炶閬撴枃鏈�
+     */
+    @TableField(value = "street_text",exist = false)
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖哄悕绉�")
+    private String streetText;
 
     /**
      * 鎵�灞炵ぞ鍖�
@@ -71,6 +83,13 @@
     @TableField("community_id")
     @ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
     private Integer communityId;
+
+    /**
+     * 鎵�灞炵ぞ鍖烘枃鏈�
+     */
+    @TableField(value = "community_text",exist = false)
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�")
+    private String communityText;
 
     /**
      * 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
@@ -105,7 +124,15 @@
      */
     @TableField("create_user")
     @ApiModelProperty(value = "鐧昏浜�")
-    private Integer createUser;
+    private Long createUser;
+
+    /**
+     * 鐧昏浜烘枃鏈�
+     */
+    @TableField(value = "create_user_text",exist = false)
+    @ApiModelProperty(value = "鐧昏浜烘枃鏈�")
+    private String createUserText;
+
 
     /**
      * 澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴)
@@ -162,4 +189,28 @@
     @TableField("close_time")
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     private LocalDateTime closeTime;
+
+    /**
+     * 杩濊浜嬩欢
+     */
+    @TableField(value = "violations",exist = false)
+    @ApiModelProperty(value = "杩濊浜嬩欢")
+    private Violations violations;
+
+    /**
+     * 杩濆缓浜嬩欢
+     */
+    @TableField(value = "illegalBuilding",exist = false)
+    @ApiModelProperty(value = "杩濆缓浜嬩欢")
+    private IllegalBuilding illegalBuilding;
+
+    /**
+     *  璋冨害淇℃伅
+     */
+    @TableField(value = "dispatchInfo",exist = false)
+    @ApiModelProperty(value = "璋冨害淇℃伅")
+    private DispatchInfo dispatchInfo;
+
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0