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/entity/ExamScore.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
index 989f442..8877714 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
@@ -55,14 +55,7 @@
/**
- * 考试类型 0:正式考试 1: 模拟考试 2:在线联系 3:调查问卷
- */
-// @TableField("exam_type")
-// private Integer examType;
-
-
- /**
- * 考试人员所属公司名称
+ * 考试人员所属公司名称id
*/
private String company;
@@ -108,9 +101,18 @@
private Integer qualified;
- /**
- * 用户id
- */
@TableField("user_id")
private String userId;
+
+
+ /**
+ * 考试id
+ */
+ @TableField("exam_id")
+ private String examId;
+
+
+
+
+
}
--
Gitblit v1.9.3