From 3848c5677aefdb201c24d615a7c2ad03fd5154e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 030bc2c..c38c6bf 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
@@ -6,18 +6,14 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
import lombok.Data;
-import lombok.experimental.Accessors;
-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.Map;
+import java.util.List;
/**
* 鑰冩牳绉垎鏄庣粏瀵硅薄 t_check_score
- *
+ *
* @author ruoyi
* @date 2024-04-22
*/
@@ -35,6 +31,7 @@
@Excel(name = "鍒嗗��")
private BigDecimal score;
+
/** deptid */
@Excel(name = "鍖哄幙")
private Long deptId;
@@ -42,7 +39,8 @@
/** 鑰冩牳妯℃澘id */
@Excel(name = "鑰冩牳妯℃澘id")
private Integer templateId;
-
+ /** 瀵瑰簲check_index_琛╥d */
+ private Long indexId;
/** 鑰冩牳鏍囩(鐪佸巺/甯傚眬) */
@Excel(name = "鑰冩牳鏍囩(鐪佸巺/甯傚眬)")
private Integer examineTag;
@@ -69,4 +67,13 @@
@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