From 0135fa289418c5fd231fa4e7c60ee7b8f06f17a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 五月 2025 19:29:11 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 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 b6a6a4a..b2fbc23 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;
@@ -116,4 +115,21 @@
@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;
+
+
}
--
Gitblit v1.7.1