From 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 31 八月 2024 20:15:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java index 17b08cf..9006893 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java @@ -1,15 +1,15 @@ package com.ycl.platform.domain.entity; import annotation.Excel; +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; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 鑰冩牳绉垎鏄庣粏瀵硅薄 t_check_score @@ -18,11 +18,13 @@ * @date 2024-04-22 */ @Data -public class CheckScore +@TableName("t_check_score") +public class CheckScore extends BaseEntity { private static final long serialVersionUID = 1L; /** */ + private Long id; /** 鍒嗗�� */ @@ -43,7 +45,7 @@ /** 鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛) */ @Excel(name = "鑰冩牳绫诲瀷(杞﹁締/浜鸿劯/瑙嗛)") - private Integer examineCategory; + private Short examineCategory; /** 淇敼鏃堕棿 */ @Excel(name = "淇敼鏃堕棿") private Date updateTime; @@ -60,5 +62,16 @@ private String publish; //鎶樼嚎鍥炬棩鏈熷弬鏁� + @TableField(exist = false) private String date; + + @TableField(exist = false) + private Date startDate; + + @TableField(exist = false) + private Date endDate; + + @TableField(exist = false) + private List<String> quarter; + } -- Gitblit v1.8.0