From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java
index bd7e183..738eb93 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java
@@ -6,7 +6,6 @@
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
-import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -35,14 +34,14 @@
/**
* 鏈�缁堝緱鍒�
*/
- @TableField("user_score")
- private BigDecimal userScore;
+ @TableField("score")
+ private BigDecimal score;
/**
* 璇曞嵎鎬诲垎
*/
- @TableField("paper_score")
- private BigDecimal paperScore;
+ @TableField("total_score")
+ private BigDecimal totalScore;
/**
* 鍋氬棰樼洰鏁伴噺
@@ -71,8 +70,8 @@
/**
* 瀛︾敓
*/
- @TableField("create_user")
- private Integer createUser;
+ @TableField("user_id")
+ private Integer userId;
/**
* 鎵规敼浜�
@@ -82,18 +81,24 @@
/**
* 鎵规敼鏃堕棿
*/
- @TableField(value = "create_time", fill = FieldFill.INSERT)
- private Date createTime;
+ @TableField(value = "judge_time", fill = FieldFill.INSERT)
+ private Date judgeTime;
/**
* 浜ゅ嵎鏃堕棿
*/
- @TableField(value = "answer_time")
- private Date answerTime;
+ @TableField(value = "submit_time")
+ private Date submitTime;
/**
* 璇曞嵎鍐呭
*/
@TableField(value = "paper_content")
private String paperContent;
+
+ /**
+ * 瀵艰埅鏍�
+ */
+ @TableField(value = "navbar")
+ private String navbar;
}
--
Gitblit v1.8.0