From e80d90bf5e5f2b8e72f02454606f1f432cbab7fd Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 18:01:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 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 9bfbb2c..5c9cfe5 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
@@ -27,19 +27,13 @@
private Integer subjectId;
/**
- * 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 4.鏃舵璇曞嵎 6.浠诲姟璇曞嵎)
+ * 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 2.闅忓嵆璇曞嵎 3.闅忓簭璇曞嵎)
*/
@TableField("paper_type")
private Integer paperType;
/**
- * 骞寸骇
- */
- @TableField("grade_level")
- private Integer gradeLevel;
-
- /**
- * 璇曞嵎鎬诲垎(鍗冨垎鍒�)
+ * 璇曞嵎鎬诲垎
*/
@TableField("score")
private Integer score;
@@ -56,31 +50,21 @@
@TableField("suggest_time")
private Integer suggestTime;
- /**
- * 鏃舵璇曞嵎 寮�濮嬫椂闂�
- */
- @TableField("limit_start_time")
- private Date limitStartTime;
-
- /**
- * 鏃舵璇曞嵎 缁撴潫鏃堕棿
- */
- @TableField("limit_end_time")
- private Date limitEndTime;
-
- /**
- * 璇曞嵎妗嗘灦 鍐呭涓篔SON
- */
- @TableField("frame_text_content_id")
- private Integer frameTextContentId;
-
@TableField("create_user")
private Integer createUser;
@TableField("create_time")
private Date createTime;
- @TableField("task_exam_id")
- private Integer taskExamId;
+ /**
+ * 鍙鎬э紝鍏紑/绉佹湁
+ * */
+ @TableField("visibility")
+ private String visibility;
+ /**
+ * 鎵ｅ垎绫诲瀷
+ * */
+ @TableField("deduct_type")
+ private String deductType;
}
--
Gitblit v1.8.0