From 8bcc04c9623e0eee0995e1139dee6258a8df464d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 12 六月 2024 09:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamTemplateVO.java | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamTemplateVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamTemplateVO.java
index 50a06de..68a94eb 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamTemplateVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamTemplateVO.java
@@ -18,14 +18,8 @@
@Data
public class ExamTemplateVO extends AbsVo {
- /** 妯℃澘鍚嶇О */
- private String name;
-
- /** 璇曞嵎绉戠洰 */
- private Integer subjectId;
-
- /** 鑰冭瘯鏃堕暱(鍒嗛挓) */
- private Integer suggestTime;
+ /** 璇曞嵎id */
+ private Integer examPaperId;
/** 鍗曢�夐鏁伴噺 */
private Integer singleChoice;
@@ -45,34 +39,22 @@
/** 璁＄畻棰樻暟閲� */
private Integer calculation;
- /** 璇曞嵎鎬诲垎 */
- private Integer score;
-
- /** 澶氶�夐鎵ｅ垎鏂瑰紡 */
- private String deductType;
-
- /** 鍒涘缓浜� */
- private Integer createUser;
-
- /** 鍒涘缓鏃堕棿 */
- private Date createTime;
-
- /** */
+ /** 鍗曢�夋瘡棰樺垎鏁� */
private BigDecimal singleScore;
- /** */
+ /** 澶氶�夋瘡棰樺垎鏁� */
private BigDecimal multipleScore;
- /** */
+ /** 濉┖姣忛鍒嗘暟 */
private BigDecimal gapScore;
- /** */
+ /** 鍒ゆ柇姣忛鍒嗘暟 */
private BigDecimal trueFalseScore;
- /** */
+ /** 绠�绛旀瘡棰樺垎鏁� */
private BigDecimal shortAnswerScore;
- /** */
+ /** 璁＄畻姣忛鍒嗘暟 */
private BigDecimal calculationScore;
public static ExamTemplateVO getVoByEntity(@NonNull ExamTemplate entity, ExamTemplateVO vo) {
--
Gitblit v1.8.0