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/ExamTemplate.java |   83 +++++++++++++++++++++++++----------------
 1 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java
index 8279fd2..b3f3ce9 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java
@@ -3,80 +3,97 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ycl.jxkg.domain.base.AbsEntity;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+
 /**
- * 闅忔満璇曞嵎妯℃澘琛�
- * */
+ * 闅忔満璇曞嵎妯℃澘
+ *
+ * @author flq
+ * @since 2024-06-05
+ */
 @Data
 @TableName("t_exam_template")
 public class ExamTemplate extends AbsEntity {
-    /**
-     *  璇曞嵎id
-     * */
-    @TableField("exam_paper_id")
-    private Integer examPaperId;
 
-    /**
-     * 鍗曢�夐鏁伴噺
-     * */
+    private static final long serialVersionUID = 1L;
+
+    @TableField("name")
+    /** 妯℃澘鍚� */
+    private String name;
+
+    @TableField("subject_id")
+    /** 瀛︾id */
+    private Integer subjectId;
+
+    @TableField("score")
+    /** 鎬诲垎 */
+    private Integer score;
+
+    @TableField("visibility")
+    /** 鏄惁绉佹湁 */
+    private String visibility;
+
+    @TableField("suggest_time")
+    /** 寤鸿鏃堕棿 */
+    private Integer suggestTime;
+
+    @TableField("deduct_type")
+    /** 澶氶�夋墸鍒嗙被鍨� */
+    private Integer deductType;
+
     @TableField("single_choice")
+    /** 鍗曢�夐鏁伴噺 */
     private Integer singleChoice;
 
-    /**
-     * 澶氶�夐鏁伴噺
-     * */
     @TableField("multiple_choice")
+    /** 澶氶�夐鏁伴噺 */
     private Integer multipleChoice;
 
-    /**
-     * 濉┖棰樻暟閲�
-     * */
     @TableField("gap_filling")
+    /** 濉┖棰樻暟閲� */
     private Integer gapFilling;
 
-    /**
-     * 鍒ゆ柇棰樻暟閲�
-     * */
     @TableField("true_false")
+    /** 鍒ゆ柇鏁伴噺 */
     private Integer trueFalse;
 
-    /**
-     * 绠�绛旈鏁伴噺
-     * */
     @TableField("short_answer")
+    /** 绠�绛旈鏁伴噺 */
     private Integer shortAnswer;
 
-    /**
-     * 璁＄畻棰樻暟閲�
-     * */
     @TableField("calculation")
+    /** 璁＄畻棰樻暟閲� */
     private Integer calculation;
 
-    /** 鍗曢�夋瘡棰樺垎鏁� */
     @TableField("single_score")
+    /** 鍗曢�夋瘡棰樺垎鏁� */
     private BigDecimal singleScore;
 
-    /** 澶氶�夋瘡棰樺垎鏁� */
     @TableField("multiple_score")
+    /** 澶氶�夋瘡棰樺垎鏁� */
     private BigDecimal multipleScore;
 
-    /** 濉┖姣忛鍒嗘暟 */
     @TableField("gap_score")
+    /** 濉┖姣忛鍒嗘暟 */
     private BigDecimal gapScore;
 
+    @TableField("true_false_score")
     /** 鍒ゆ柇姣忛鍒嗘暟 */
-    @TableField("trueFalse_score")
     private BigDecimal trueFalseScore;
 
+    @TableField("short_answer_score")
     /** 绠�绛旀瘡棰樺垎鏁� */
-    @TableField("shortAnswer_score")
     private BigDecimal shortAnswerScore;
 
+    @TableField("calculation__score")
     /** 璁＄畻姣忛鍒嗘暟 */
-    @TableField("calculation_score")
     private BigDecimal calculationScore;
+
+    @TableField("create_user")
+    /**  */
+    private Integer createUser;
+
+
 }

--
Gitblit v1.8.0