From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 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 c9f3f9d..8ef55dd 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
@@ -49,11 +49,11 @@
@TableField("auditor_id")
private Long auditorId;
- @ApiModelProperty(value = "审核类型（1:延期申请, 2:上报申请）")
+ @ApiModelProperty(value = "审核类型（1:延期申请, 2:上报申请，3=下派）")
@TableField("audit_type")
private Integer auditType;
- @ApiModelProperty(value = "审核状态 (0:待审核 1:审核通过 2:审核驳回)")
+ @ApiModelProperty(value = "审核状态 (-1：未提交审核,0:待审核 1:审核通过 2:审核驳回)")
@TableField("audit_status")
private Integer auditStatus;
@@ -92,10 +92,35 @@
@ApiModelProperty("上报人")
private String reporter;
+ @ApiModelProperty("上报人id")
+ private Long reporterId;
+
+ @ApiModelProperty("上报人层级 1=市级账号，2=区县账号，3=街道账号，4=社区账号 5=党员账号")
+ private Integer reporterLevel;
+
@ApiModelProperty("所属部门")
private String departmentName;
@ApiModelProperty("部门id")
private Integer departmentId;
+ @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号 5=党员账号")
+ @TableField("report_type")
+ private Integer reportType;
+
+ @ApiModelProperty(value = "上级id")
+ @TableField("superior_id")
+ private Long superiorId;
+
+ @ApiModelProperty(value = "排序")
+ @TableField("sort")
+ private Integer sort;
+
+ @ApiModelProperty("审核人")
+ @TableField("auditor_name")
+ private String auditorName;
+
+ @ApiModelProperty("审核人联系方式")
+ @TableField("auditor_phone")
+ private String auditorPhone;
}
--
Gitblit v1.7.1