From bcd8b3b7e8ef8ca9079b53f316d1973308e3e457 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 15:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java |   13 +++++++++++--
 1 files changed, 11 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..2d6d397 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,9 @@
 	 * 考勤提交的结果
 	 */
 	private List<ExamResultVO> examResultVOS;
+
+	/**
+	 * 考试类型
+	 */
+	private Integer examType;
 }

--
Gitblit v1.9.3