From 9ff71e0d63c963f2c2c48facdf2336c558ba7100 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期日, 23 二月 2025 18:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/entity/Complaint.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
similarity index 65%
rename from springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/entity/Complaint.java
rename to springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
index 692325b..9feb910 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/entity/Complaint.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
@@ -1,4 +1,4 @@
-package com.panzhihua.sangeshenbian.entity;
+package com.panzhihua.sangeshenbian.model.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -6,11 +6,14 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
+import java.util.Date;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.checkerframework.checker.units.qual.A;
/**
* <p>
@@ -39,7 +42,7 @@
@ApiModelProperty(value = "问题发生时间")
@TableField("time")
- private LocalDateTime time;
+ private Date time;
@ApiModelProperty(value = "问题类型")
@TableField("problem_type")
@@ -85,9 +88,13 @@
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "办理人id")
- @TableField("handler_id")
- private Long handlerId;
+ @ApiModelProperty(value = "上报类型 1-社区 2-街道 3-区县 4-市")
+ @TableField("report_type")
+ private Integer reportType;
+
+ @ApiModelProperty(value = "上级id")
+ @TableField("superior_id")
+ private Long superiorId;
@ApiModelProperty(value = "创建人")
@TableField("create_by")
@@ -95,7 +102,7 @@
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
@ApiModelProperty(value = "修改人")
@TableField("update_by")
@@ -103,7 +110,38 @@
@ApiModelProperty(value = "修改时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
+ @ApiModelProperty(value = "办理结果描述")
+ @TableField("completion_description")
+ private String completionDescription;
+
+ @ApiModelProperty(value = "办理结果图片")
+ @TableField("completion_images")
+ private String completionImages;
+
+ @ApiModelProperty(value = "办理结果视频")
+ @TableField("completion_videos")
+ private String completionVideos;
+
+ @ApiModelProperty(value = "办理结果其他说明")
+ @TableField("completion_other_description")
+ private String completionOtherDescription;
+
+ @ApiModelProperty(value = "办结时间")
+ @TableField("completion_time")
+ private Date completionTime;
+
+ @ApiModelProperty(value = "办结人员id")
+ @TableField("completion_user_id")
+ private Integer completionUserId;
+
+ @ApiModelProperty(value = "办结人员")
+ @TableField("completion_username")
+ private String completionUsername;
+
+ @ApiModelProperty(value = "办结人员")
+ @TableField("completion_user_phone")
+ private String completionUserPhone;
}
--
Gitblit v1.7.1