From 008be75ef25dd2c7e8553fe79ec25722f4c2ea48 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaper.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
similarity index 63%
rename from src/main/java/com/ycl/jxkg/domain/ExamPaper.java
rename to src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
index f28e150..e0c889d 100644
--- a/src/main/java/com/ycl/jxkg/domain/ExamPaper.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
@@ -1,73 +1,86 @@
-package com.ycl.jxkg.domain;
+package com.ycl.jxkg.domain.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
-public class ExamPaper implements Serializable {
+@TableName("t_exam_paper")
+public class ExamPaper extends AbsEntity {
private static final long serialVersionUID = 8509645224550501395L;
-
- private Integer id;
/**
* 璇曞嵎鍚嶇О
*/
+ @TableField("name")
private String name;
/**
* 瀛︾
*/
+ @TableField("subject_id")
private Integer subjectId;
/**
* 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 4.鏃舵璇曞嵎 6.浠诲姟璇曞嵎)
*/
+ @TableField("paper_type")
private Integer paperType;
/**
* 骞寸骇
*/
+ @TableField("grade_level")
private Integer gradeLevel;
/**
* 璇曞嵎鎬诲垎(鍗冨垎鍒�)
*/
+ @TableField("score")
private Integer score;
/**
* 棰樼洰鏁伴噺
*/
+ @TableField("question_count")
private Integer questionCount;
/**
* 寤鸿鏃堕暱(鍒嗛挓)
*/
+ @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;
- private Boolean deleted;
-
+ @TableField("task_exam_id")
private Integer taskExamId;
/**
--
Gitblit v1.8.0