Merge remote-tracking branch 'origin/master'

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordForMarkingBean.java

@@ -30,13 +30,9 @@ public class ExamRecordForMarkingBean implements JsonSerializable{
 	 */
 	private String basePaperName;
 	/**
-	 * 课程code
+	 * 课程Id
 	 */
-	private String courseCode;
-	/**
-	 * 课程名称
-	 */
-	private String courseName;
+	private Long courseId;
 	/**
 	 * 试卷类型 A、B、O
 	 */
@@ -83,20 +79,12 @@ public class ExamRecordForMarkingBean implements JsonSerializable{
 		this.paperType = paperType;
 	}
 
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseName() {
-		return courseName;
+	public Long getCourseId() {
+		return courseId;
 	}
 
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
 	}
 
 	public Long getExamId() {

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/FindExamRecordForMarkingInfoReq.java

@@ -13,7 +13,7 @@ public class FindExamRecordForMarkingInfoReq extends BaseRequest{
 	
 	private Long examId;
 	
-	private String courseCode;
+	private Long courseId;
 
 	public Long getId() {
 		return id;
@@ -31,12 +31,12 @@ public class FindExamRecordForMarkingInfoReq extends BaseRequest{
 		this.examId = examId;
 	}
 
-	public String getCourseCode() {
-		return courseCode;
+	public Long getCourseId() {
+		return courseId;
 	}
 
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
 	}
-	
+
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/QueryValidExamRecordInfoReq.java

@@ -11,7 +11,7 @@ public class QueryValidExamRecordInfoReq extends BaseRequest{
 
 	private Long examId;
 	
-	private String courseCode;
+	private Long courseId;
 
 	public Long getExamId() {
 		return examId;
@@ -21,12 +21,12 @@ public class QueryValidExamRecordInfoReq extends BaseRequest{
 		this.examId = examId;
 	}
 
-	public String getCourseCode() {
-		return courseCode;
+	public Long getCourseId() {
+		return courseId;
 	}
 
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
 	}
-	
+
 }