Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-13 47b20dbb8f81f2a3ac113a7e209a8b4d1cb0146d

 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 +
                '}';
    }
}