From c99438c64037b06c629e37f1f1acb5ce48a31036 Mon Sep 17 00:00:00 2001
From: 17808 <1780814303@qq.com>
Date: 星期三, 13 九月 2023 13:05:38 +0800
Subject: [PATCH] Merge branch 'lyl-dev'

---
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 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 2a03614..fe4001a 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
@@ -1,15 +1,13 @@
 package com.ycl.entity.caseHandler;
 
-import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.vo.casePool.ViolationsVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -63,7 +61,7 @@
     /**
      * 闂绫诲埆鏂囨湰
      */
-    @TableField(value = "category_text",exist = false)
+    @TableField(value = "category_text", exist = false)
     @ApiModelProperty(value = "闂绫诲埆鏂囨湰")
     private String categoryText;
 
@@ -76,7 +74,7 @@
     /**
      * 鎵�灞炶閬撴枃鏈�
      */
-    @TableField(value = "street_text",exist = false)
+    @TableField(value = "street_text", exist = false)
     @ApiModelProperty(value = "鎵�灞炵ぞ鍖哄悕绉�")
     private String streetText;
 
@@ -90,7 +88,7 @@
     /**
      * 鎵�灞炵ぞ鍖烘枃鏈�
      */
-    @TableField(value = "community_text",exist = false)
+    @TableField(value = "community_text", exist = false)
     @ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�")
     private String communityText;
 
@@ -132,7 +130,7 @@
     /**
      * 鐧昏浜烘枃鏈�
      */
-    @TableField(value = "create_user_text",exist = false)
+    @TableField(value = "create_user_text", exist = false)
     @ApiModelProperty(value = "鐧昏浜烘枃鏈�")
     private String createUserText;
 
@@ -186,6 +184,14 @@
     @ApiModelProperty(value = "甯傚钩鍙扮紪鐮�")
     private String taskCode;
 
+
+    /**
+     * 甯傚钩鍙扮紪鐮�
+     */
+    @TableField("pic")
+    @ApiModelProperty(value = "妗堜欢涓婃姤鍥剧墖")
+    private String url;
+
     /**
      * 缁撴潫鏃堕棿
      */
@@ -193,27 +199,37 @@
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     private LocalDateTime closeTime;
 
+    @TableField(value = "grid_id")
+    @ApiModelProperty(value = "缃戞牸id")
+    private Long gridId;
+
     /**
      * 杩濊浜嬩欢
      */
-    @TableField(value = "violations",exist = false)
+    @TableField(value = "violations", exist = false)
     @ApiModelProperty(value = "杩濊浜嬩欢")
-    private Violations violations;
+    private ViolationsVO violationsVO;
 
     /**
      * 杩濆缓浜嬩欢
      */
-    @TableField(value = "illegalBuilding",exist = false)
+    @TableField(value = "illegalBuilding", exist = false)
     @ApiModelProperty(value = "杩濆缓浜嬩欢")
     private IllegalBuilding illegalBuilding;
 
     /**
-     *  璋冨害淇℃伅
+     * 璋冨害淇℃伅
      */
-    @TableField(value = "dispatchInfo",exist = false)
+    @TableField(value = "dispatchInfo", exist = false)
     @ApiModelProperty(value = "璋冨害淇℃伅")
     private DispatchInfo dispatchInfo;
 
+    @TableField("pic")
+    @ApiModelProperty(value = "鍥剧墖")
+    private String pic;
 
+    @TableField("media")
+    @ApiModelProperty(value = "瑙嗛")
+    private String media;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0