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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 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 4a699a7..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.*;
@@ -57,6 +58,12 @@
@TableField("category")
@ApiModelProperty(value = "闂绫诲埆锛�1-杩濊 2-杩濆缓锛�")
private Integer category;
+ /**
+ * 闂绫诲埆鏂囨湰
+ */
+ @TableField(value = "category_text", exist = false)
+ @ApiModelProperty(value = "闂绫诲埆鏂囨湰")
+ private String categoryText;
/**
* 鎵�灞炶閬�
@@ -64,6 +71,12 @@
@TableField("street_id")
@ApiModelProperty(value = "鎵�灞炶閬�")
private Integer streetId;
+ /**
+ * 鎵�灞炶閬撴枃鏈�
+ */
+ @TableField(value = "street_text", exist = false)
+ @ApiModelProperty(value = "鎵�灞炵ぞ鍖哄悕绉�")
+ private String streetText;
/**
* 鎵�灞炵ぞ鍖�
@@ -71,6 +84,13 @@
@TableField("community_id")
@ApiModelProperty(value = "鎵�灞炵ぞ鍖�")
private Integer communityId;
+
+ /**
+ * 鎵�灞炵ぞ鍖烘枃鏈�
+ */
+ @TableField(value = "community_text", exist = false)
+ @ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�")
+ private String communityText;
/**
* 鎶ヨ鐐逛綅 浜嬪彂鍦扮偣
@@ -106,6 +126,14 @@
@TableField("create_user")
@ApiModelProperty(value = "鐧昏浜�")
private Long createUser;
+
+ /**
+ * 鐧昏浜烘枃鏈�
+ */
+ @TableField(value = "create_user_text", exist = false)
+ @ApiModelProperty(value = "鐧昏浜烘枃鏈�")
+ private String createUserText;
+
/**
* 澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴)
@@ -162,4 +190,27 @@
@TableField("close_time")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
private LocalDateTime closeTime;
+
+ /**
+ * 杩濊浜嬩欢
+ */
+ @TableField(value = "violations", exist = false)
+ @ApiModelProperty(value = "杩濊浜嬩欢")
+ private ViolationsVO violationsVO;
+
+ /**
+ * 杩濆缓浜嬩欢
+ */
+ @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