From 47b20dbb8f81f2a3ac113a7e209a8b4d1cb0146d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 13 九月 2021 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java |   29 ++++-------------------------
 1 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java
index bddb92f..6b1213b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java
@@ -3,9 +3,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import lombok.Data;
 
@@ -46,7 +44,7 @@
     /**
      *审核人员
      */
-    private String approver;
+    private Long approverId;
     /**
      *审核状态(1.待审核 2.驳回 3.通过)
      */
@@ -78,30 +76,11 @@
     /**
      *创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createAt;
     /**
      *更新时间
      */
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateAt;
-
-    @Override
-    public String toString() {
-        return "ComPensionAuthRecordDO{" +
-                "id=" + id +
-                ", pensionerId=" + pensionerId +
-                ", submitUserId=" + submitUserId +
-                ", authPeriod='" + authPeriod + '\'' +
-                ", authVideo='" + authVideo + '\'' +
-                ", approver='" + approver + '\'' +
-                ", approvalStatus=" + approvalStatus +
-                ", approvalDate=" + approvalDate +
-                ", mark='" + mark + '\'' +
-                ", rejectReason='" + rejectReason + '\'' +
-                ", authStatus=" + authStatus +
-                ", authDate=" + authDate +
-                ", communityId=" + communityId +
-                ", createAt=" + createAt +
-                ", updateAt=" + updateAt +
-                '}';
-    }
 }

--
Gitblit v1.7.1