From 2f084c24fcc1c42e401edde4c8c6939d53c94764 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 25 二月 2025 00:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java
index ce99bd2..c9f3f9d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java
@@ -6,6 +6,9 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,7 +34,12 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
private Long id;
+
+ @ApiModelProperty(value = "是否最新")
+ @TableField("latest_flag")
+ private Boolean latestFlag;
@ApiModelProperty(value = "诉求id")
@TableField("complaint_id")
@@ -71,7 +79,7 @@
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
@ApiModelProperty(value = "修改人")
@TableField("update_by")
@@ -79,7 +87,15 @@
@ApiModelProperty(value = "修改时间")
@TableField("update_time")
- private LocalDateTime updateTime;
+ private Date updateTime;
+ @ApiModelProperty("上报人")
+ private String reporter;
+
+ @ApiModelProperty("所属部门")
+ private String departmentName;
+
+ @ApiModelProperty("部门id")
+ private Integer departmentId;
}
--
Gitblit v1.7.1