Merge remote-tracking branch 'origin/master'

fuliqi

2024-05-31 008be75ef25dd2c7e8553fe79ec25722f4c2ea48

 src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java

File was renamed from src/main/java/com/ycl/jxkg/domain/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;

    /**
     * 试卷框架 内容为JSON
     */
    @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;

    /**