From 6aa6dc075078cca11be048a267911bd7f74dadcd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 16 三月 2025 03:48:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
index ee674bc..c098c32 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
@@ -79,7 +79,6 @@
@ApiModelProperty(value = "问题标题")
@TableField("description_title")
- @NotBlank(message = "问题标题不能为空")
private String descriptionTitle;
@ApiModelProperty(value = "问题描述内容")
@@ -99,14 +98,38 @@
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号")
- @TableField("report_type")
- private Integer reportType;
+ @ApiModelProperty(value = "上级类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号")
+ @TableField("superior_type")
+ private Integer superiorType;
@ApiModelProperty(value = "上级id")
@TableField("superior_id")
private Long superiorId;
-
+
+ @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号，5=党员账号")
+ @TableField("report_type")
+ private Integer reportType;
+
+ @ApiModelProperty(value = "上报人所属市")
+ @TableField("city_code")
+ private Integer cityCode;
+
+ @ApiModelProperty(value = "上报人所属区县")
+ @TableField("districts_code")
+ private Integer districtsCode;
+
+ @ApiModelProperty(value = "上报人所属街道id")
+ @TableField("street_id")
+ private Long streetId;
+
+ @ApiModelProperty(value = "上报人所属社区id")
+ @TableField("community_id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "上报党员id")
+ @TableField("party_member_id")
+ private Long partyMemberId;
+
@ApiModelProperty(value = "创建人")
@TableField("create_by")
private Long createBy;
--
Gitblit v1.7.1