From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 7d65213..8f1818a 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
@@ -1,19 +1,18 @@
package com.panzhihua.sangeshenbian.model.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -53,7 +52,7 @@
@TableField("audit_type")
private Integer auditType;
- @ApiModelProperty(value = "审核状态 (-1：未提交审核,0:待审核 1:审核通过 2:审核驳回)")
+ @ApiModelProperty(value = "审核状态 (-1：未提交审核,0:待审核 1:审核通过 2:审核驳回 3:上报撤回)")
@TableField("audit_status")
private Integer auditStatus;
@@ -92,6 +91,12 @@
@ApiModelProperty("上报人")
private String reporter;
+ @ApiModelProperty("上报人id")
+ private Long reporterId;
+
+ @ApiModelProperty("上报人层级 1=市级账号，2=区县账号，3=街道账号，4=社区账号 5=党员账号")
+ private Integer reporterLevel;
+
@ApiModelProperty("所属部门")
private String departmentName;
@@ -110,4 +115,28 @@
@TableField("sort")
private Integer sort;
+ @ApiModelProperty("审核人")
+ @TableField("auditor_name")
+ private String auditorName;
+
+ @ApiModelProperty("审核人联系方式")
+ @TableField("auditor_phone")
+ private String auditorPhone;
+
+ @ApiModelProperty("申请人id")
+ @TableField("apply_id")
+ private Long applyId;
+
+ @ApiModelProperty("申请人id名称")
+ @TableField("apply_name")
+ private String applyName;
+
+ @ApiModelProperty(value = "审核时间")
+ @TableField("audit_time")
+ private Date auditTime;
+
+ @ApiModelProperty("申请人联系方式")
+ @TableField("apply_phone")
+ private String applyPhone;
+
}
--
Gitblit v1.7.1