From 879ce4e66b36daf44f79b17eb02d3578148e4545 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 18:56:20 +0800
Subject: [PATCH] 解决冲突
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java | 14 ++++++++++++--
1 files changed, 12 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 1172dca..2ebbf0e 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,8 @@
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;
@@ -75,7 +77,7 @@
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
- private LocalDateTime createTime;
+ private Date createTime;
@ApiModelProperty(value = "修改人")
@TableField("update_by")
@@ -83,7 +85,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