Merge remote-tracking branch 'origin/dev_v3.0.0' into dev_v3.0.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TeachStudent.java

@@ -44,6 +44,10 @@ public class TeachStudent extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
+    @ApiModelProperty(value = "学生所在校区（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long campusId;
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -99,4 +103,12 @@ public class TeachStudent extends BaseEntity implements Serializable {
     public void setUserId(Long userId) {
         this.userId = userId;
     }
+
+    public Long getCampusId() {
+        return campusId;
+    }
+
+    public void setCampusId(Long campusId) {
+        this.campusId = campusId;
+    }
 }

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

@@ -153,6 +153,7 @@ public class TeachStudentServiceImpl extends ServiceImpl<TeachStudentMapper, Tea
                 teachStudent.setTeachClazzId(teachClazzId);
                 teachStudent.setTeachCourseId(teachClazz.getTeachCourseId());
                 teachStudent.setUserId(teachClazz.getUserId());
+                teachStudent.setCampusId(basicStudent.getCampusId());
                 teachStudent.insertInfo(requestUser.getId());
                 teachStudentList.add(teachStudent);
             }