From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
index 5c9cfe5..1ce5e12 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -21,12 +23,6 @@
private String name;
/**
- * 瀛︾
- */
- @TableField("subject_id")
- private Integer subjectId;
-
- /**
* 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 2.闅忓嵆璇曞嵎 3.闅忓簭璇曞嵎)
*/
@TableField("paper_type")
@@ -36,13 +32,13 @@
* 璇曞嵎鎬诲垎
*/
@TableField("score")
- private Integer score;
+ private BigDecimal score;
/**
* 棰樼洰鏁伴噺
*/
- @TableField("question_count")
- private Integer questionCount;
+ @TableField("num")
+ private Integer num;
/**
* 寤鸿鏃堕暱(鍒嗛挓)
@@ -54,6 +50,7 @@
private Integer createUser;
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -63,8 +60,20 @@
private String visibility;
/**
- * 鎵ｅ垎绫诲瀷
+ * 澶氶�夋墸鍒嗙被鍨�
* */
@TableField("deduct_type")
- private String deductType;
+ private Integer deductType;
+
+ /**
+ * 澶氶�夎瘎鍒嗗垎鏁�
+ * */
+ @TableField("deduct_type_score")
+ private BigDecimal deductTypeScore;
+
+ /**
+ * 棰樼洰鏍煎紡
+ * */
+ @TableField("content")
+ private String content;
}
--
Gitblit v1.8.0