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 |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 3ead552..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,7 +2,6 @@
 
 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;
@@ -17,7 +16,12 @@
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 试卷id
+	 * 公司名称
+	 */
+	private String companyName;
+
+	/**
+	 * 考试id,提交成绩时用
 	 */
 	private Long papersId;
 
@@ -25,4 +29,21 @@
 	 * 考勤提交的结果
 	 */
 	private List<ExamResultVO> examResultVOS;
+
+	/**
+	 * 考试类型
+	 */
+	private Integer examType;
+
+
+	/**
+	 * 是否考试  1：否  2：是，考试结束  3:考试中
+	 */
+	private Integer isExam;
+
+	/**
+	 * 用户名
+	 */
+	private String account;
+
 }

--
Gitblit v1.9.3