From 17bd0962b7caba32f35d29a1082e7c998342e65d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 00:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 20be111..1172dca 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
@@ -30,8 +30,12 @@
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.NONE)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
+
+    @ApiModelProperty(value = "是否最新")
+    @TableField("latest_flag")
+    private Boolean latestFlag;
 
     @ApiModelProperty(value = "诉求id")
     @TableField("complaint_id")
@@ -43,11 +47,15 @@
 
     @ApiModelProperty(value = "审核类型(1:延期申请, 2:上报申请)")
     @TableField("audit_type")
-    private Boolean auditType;
+    private Integer auditType;
 
     @ApiModelProperty(value = "审核状态 (0:待审核 1:审核通过 2:审核驳回)")
     @TableField("audit_status")
-    private Boolean auditStatus;
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "驳回原因")
+    @TableField("reject_reason")
+    private String rejectReason;
 
     @ApiModelProperty(value = "上报说明/延期申请说明")
     @TableField("comment")

--
Gitblit v1.7.1