From 37f41a7c17d81a60092e9d69363905f21d9b1a49 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 19 三月 2024 17:34:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
index 8f2889e..fce5d43 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
@@ -1,11 +1,14 @@
 package com.ycl.platform.domain.entity;
 
 import annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.system.entity.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 鑰冩牳鍙戝竷瀵硅薄 t_check_publish
@@ -13,6 +16,7 @@
  * @author ruoyi
  * @date 2024-03-07
  */
+@Data
 public class TCheckPublish extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -53,10 +57,40 @@
     private Long updateUser;
     /** 瀹℃牳鐘舵�� */
     private Short auditState;
-
+    @Excel(name = "瀹℃牳浜�")
+    private String auditUser;
+    @Excel(name = "瀹℃牳鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date auditTime;
+    @Excel(name  = "瀹℃牳鎰忚")
+    private String auditDescription;
     /** 鎻忚堪 */
     @Excel(name = "鎻忚堪")
     private String description;
+
+    public String getAuditUser() {
+        return auditUser;
+    }
+
+    public void setAuditUser(String auditUser) {
+        this.auditUser = auditUser;
+    }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public String getAuditDescription() {
+        return auditDescription;
+    }
+
+    public void setAuditDescription(String auditDescription) {
+        this.auditDescription = auditDescription;
+    }
 
     public Short getAuditState() {
         return auditState;
@@ -186,6 +220,9 @@
                 ", updateUserName='" + updateUserName + '\'' +
                 ", updateUser=" + updateUser +
                 ", auditState=" + auditState +
+                ", auditUser='" + auditUser + '\'' +
+                ", auditTime=" + auditTime +
+                ", auditDescription='" + auditDescription + '\'' +
                 ", description='" + description + '\'' +
                 '}';
     }

--
Gitblit v1.8.0