From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 05 九月 2024 21:55:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java index f83afb4..86b9dff 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java @@ -1,6 +1,9 @@ package com.ycl.platform.domain.entity; import annotation.Excel; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.system.entity.BaseEntity; import lombok.Data; @@ -11,12 +14,13 @@ /** * 鑰冩牳瑙勫垯瀵硅薄 t_check_rule - * + * * @author ruoyi * @date 2024-04-15 */ @Data -public class CheckRule extends BaseEntity +@TableName("t_check_rule") +public class CheckRule { private static final long serialVersionUID = 1L; @@ -48,7 +52,20 @@ /** 閫昏緫鍒犻櫎 */ @Excel(name = "閫昏緫鍒犻櫎") - private String deleted; + private Integer deleted; + /** 鍥炬爣 */ + @Excel(name = "icon") + private String icon; + + /** 鏇存柊鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** 鏁版嵁涓績瀵瑰簲鐨勬帴鍙e湴鍧� */ + private String apiUrl; + + /** 鎺掑簭鍊� */ + private Integer orderNum; } -- Gitblit v1.8.0