Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -522,7 +522,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             if (!teacher.getTenantId().equals(teacherSubmitReq.getTenantId())) {
                 if (teacherSubmitReq.getTenantId().equals(-1L)) {
                     // 平台老师处理流程
-                    if (ESettlementFrom.TENANT.equals(teacher.getSettlementFrom())) {
+                    if (ESettlementFrom.TENANT.equals(teacherSubmitReq.getSettlementFrom())) {
                         // 解绑后，结算方式如果是机构，默认调整为老师
                         teacherSubmitReq.setSettlementFrom(ESettlementFrom.TEACHER);
                         teacherSubmitReq.setIsSettlement(true);