From 8cce5b3f94ef66a48fcaf31f7b94678b96f3b1a5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 19 三月 2024 14:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java |  103 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 92 insertions(+), 11 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 eee3d32..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,9 +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
@@ -11,6 +16,7 @@
  * @author ruoyi
  * @date 2024-03-07
  */
+@Data
 public class TCheckPublish extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -28,7 +34,7 @@
 
     /** 鑰冩牳鑼冨洿 1/2 鍒嗗眬/甯傚眬 */
     @Excel(name = "鑰冩牳鑼冨洿 1/2 鍒嗗眬/甯傚眬")
-    private Long timeRange;
+    private Long examineRange;
 
     /** 鑰冩牳棰戠巼 1/2 鏈堝害鑰冩牳/瀛ｅ害鑰冩牳 */
     @Excel(name = "鑰冩牳棰戠巼 1/2 鏈堝害鑰冩牳/瀛ｅ害鑰冩牳")
@@ -38,17 +44,61 @@
     @Excel(name = "鑰冩牳鐘舵�� 0/1 鍚敤 / 鍋滅敤")
     private Long state;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** 鎶ヨ鍒嗘暟闃堝�� */
+    @Excel(name = "鎶ヨ鍒嗘暟闃堝��")
+    private BigDecimal alarmScore;
+
     private Long createUser;
+    @Excel(name = "鍒涘缓浜�")
+    private String createUserName;
+    @Excel(name = "淇敼浜�")
+    private String updateUserName;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     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;
+    }
+
+    public void setAuditState(Short auditState) {
+        this.auditState = auditState;
+    }
 
     public String getExamineName() {
         return examineName;
@@ -56,6 +106,14 @@
 
     public void setExamineName(String examineName) {
         this.examineName = examineName;
+    }
+
+    public BigDecimal getAlarmScore() {
+        return alarmScore;
+    }
+
+    public void setAlarmScore(BigDecimal alarmScore) {
+        this.alarmScore = alarmScore;
     }
 
     public void setId(Long id)
@@ -77,12 +135,28 @@
         return templateId;
     }
 
-    public Long getTimeRange() {
-        return timeRange;
+    public Long getExamineRange() {
+        return examineRange;
     }
 
-    public void setTimeRange(Long timeRange) {
-        this.timeRange = timeRange;
+    public void setExamineRange(Long examineRange) {
+        this.examineRange = examineRange;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
+
+    public String getUpdateUserName() {
+        return updateUserName;
+    }
+
+    public void setUpdateUserName(String updateUserName) {
+        this.updateUserName = updateUserName;
     }
 
     public void setFrequency(Long frequency)
@@ -137,11 +211,18 @@
                 "id=" + id +
                 ", examineName='" + examineName + '\'' +
                 ", templateId=" + templateId +
-                ", timeRange=" + timeRange +
+                ", examineRange=" + examineRange +
                 ", frequency=" + frequency +
                 ", state=" + state +
+                ", alarmScore=" + alarmScore +
                 ", createUser=" + createUser +
+                ", createUserName='" + createUserName + '\'' +
+                ", updateUserName='" + updateUserName + '\'' +
                 ", updateUser=" + updateUser +
+                ", auditState=" + auditState +
+                ", auditUser='" + auditUser + '\'' +
+                ", auditTime=" + auditTime +
+                ", auditDescription='" + auditDescription + '\'' +
                 ", description='" + description + '\'' +
                 '}';
     }

--
Gitblit v1.8.0