From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
index ab5c711..8c7a927 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
@@ -2,9 +2,9 @@
import lombok.Data;
import org.springblade.modules.exam.entity.ExamScore;
-import org.springblade.modules.exam.entity.ExamSubjectOption;
import java.io.Serializable;
+import java.util.List;
/**
* 选择题选项实体类vo
@@ -15,5 +15,35 @@
public class ExamScoreVO extends ExamScore implements Serializable {
private static final long serialVersionUID = 1L;
+ /**
+ * 公司名称
+ */
+ private String companyName;
+
+ /**
+ * 考试id,提交成绩时用
+ */
+ private Long papersId;
+
+ /**
+ * 考勤提交的结果
+ */
+ private List<ExamResultVO> examResultVOS;
+
+ /**
+ * 考试类型
+ */
+ private Integer examType;
+
+
+ /**
+ * 是否考试 1：否 2：是，考试结束 3:考试中
+ */
+ private Integer isExam;
+
+ /**
+ * 用户名
+ */
+ private String account;
}
--
Gitblit v1.9.3