Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TBExamStudentResult.java

@@ -17,10 +17,10 @@ import java.io.Serializable;
 public class TBExamStudentResult extends TBExamStudent implements Serializable {
 
     @ApiModelProperty(value = "开课学院名称")
-    private String teachCollegeName;
+    private String teacherCollegeName;
 
     @ApiModelProperty(value = "开课学院编码")
-    private String teachCollegeCode;
+    private String teacherCollegeCode;
 
     @ApiModelProperty(value = "考查学院名称")
     private String inspectCollegeName;
@@ -29,10 +29,10 @@ public class TBExamStudentResult extends TBExamStudent implements Serializable {
     private String inspectCollegeCode;
 
     @ApiModelProperty(value = "教师姓名")
-    private String teachName;
+    private String teacherName;
 
     @ApiModelProperty(value = "教师编码")
-    private String teachCode;
+    private String teacherCode;
 
     @ApiModelProperty(value = "班级名称")
     private String clazzName;
@@ -56,14 +56,6 @@ public class TBExamStudentResult extends TBExamStudent implements Serializable {
         this.clazzCode = clazzCode;
     }
 
-    public String getTeachCollegeName() {
-        return teachCollegeName;
-    }
-
-    public void setTeachCollegeName(String teachCollegeName) {
-        this.teachCollegeName = teachCollegeName;
-    }
-
     public String getInspectCollegeName() {
         return inspectCollegeName;
     }
@@ -72,14 +64,6 @@ public class TBExamStudentResult extends TBExamStudent implements Serializable {
         this.inspectCollegeName = inspectCollegeName;
     }
 
-    public String getTeachCollegeCode() {
-        return teachCollegeCode;
-    }
-
-    public void setTeachCollegeCode(String teachCollegeCode) {
-        this.teachCollegeCode = teachCollegeCode;
-    }
-
     public String getInspectCollegeCode() {
         return inspectCollegeCode;
     }
@@ -88,19 +72,35 @@ public class TBExamStudentResult extends TBExamStudent implements Serializable {
         this.inspectCollegeCode = inspectCollegeCode;
     }
 
-    public String getTeachName() {
-        return teachName;
+    public String getTeacherCollegeName() {
+        return teacherCollegeName;
+    }
+
+    public void setTeacherCollegeName(String teacherCollegeName) {
+        this.teacherCollegeName = teacherCollegeName;
+    }
+
+    public String getTeacherCollegeCode() {
+        return teacherCollegeCode;
+    }
+
+    public void setTeacherCollegeCode(String teacherCollegeCode) {
+        this.teacherCollegeCode = teacherCollegeCode;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
     }
 
-    public void setTeachName(String teachName) {
-        this.teachName = teachName;
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
     }
 
-    public String getTeachCode() {
-        return teachCode;
+    public String getTeacherCode() {
+        return teacherCode;
     }
 
-    public void setTeachCode(String teachCode) {
-        this.teachCode = teachCode;
+    public void setTeacherCode(String teacherCode) {
+        this.teacherCode = teacherCode;
     }
 }