From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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 | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 c607900..4eb7d74 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;
@@ -193,17 +194,23 @@
/**
* 杩濊浜嬩欢
*/
- @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)
+ @ApiModelProperty(value = "璋冨害淇℃伅")
+ private DispatchInfo dispatchInfo;
}
\ No newline at end of file
--
Gitblit v1.8.0