From 79dfece0f33f86cc8dd99269498d9bb9d4b0c6bf Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 17 三月 2023 18:30:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 eb69ffa..439057f 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.vo.casePool.ViolationsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@@ -60,7 +61,7 @@
/**
* 闂绫诲埆鏂囨湰
*/
- @TableField(value = "category_text",exist = false)
+ @TableField(value = "category_text", exist = false)
@ApiModelProperty(value = "闂绫诲埆鏂囨湰")
private String categoryText;
@@ -73,7 +74,7 @@
/**
* 鎵�灞炶閬撴枃鏈�
*/
- @TableField(value = "street_text",exist = false)
+ @TableField(value = "street_text", exist = false)
@ApiModelProperty(value = "鎵�灞炵ぞ鍖哄悕绉�")
private String streetText;
@@ -87,7 +88,7 @@
/**
* 鎵�灞炵ぞ鍖烘枃鏈�
*/
- @TableField(value = "community_text",exist = false)
+ @TableField(value = "community_text", exist = false)
@ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�")
private String communityText;
@@ -129,7 +130,7 @@
/**
* 鐧昏浜烘枃鏈�
*/
- @TableField(value = "create_user_text",exist = false)
+ @TableField(value = "create_user_text", exist = false)
@ApiModelProperty(value = "鐧昏浜烘枃鏈�")
private String createUserText;
@@ -190,24 +191,28 @@
@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;
--
Gitblit v1.8.0