Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ApprovalForm/BasicInfo.java

@@ -39,6 +39,9 @@ public class BasicInfo {
     @ApiModelProperty(value = "拟卷老师")
     private String teacherName;
 
+    @ApiModelProperty(value = "课程名称")
+    private String courseName;
+
     public Long getCollegeId() {
         return collegeId;
     }
@@ -110,4 +113,12 @@ public class BasicInfo {
     public void setTeacherName(String teacherName) {
         this.teacherName = teacherName;
     }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1802,6 +1802,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         basicInfo.setTeacherName(examTask.getTeacherName());
         basicInfo.setExamStartTime(examObjectDto.getExamStartTime());
         basicInfo.setExamEndTime(examObjectDto.getExamEndTime());
+        basicInfo.setCourseName(examTask.getCourseName());
 
 
         examTaskApprovalFormDto.setBasicInfo(basicInfo);