Merge branch 'feature/0721-tenant' into develop

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

@@ -602,11 +602,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
         teacher.setTenantId(teacherSubmitReq.getTenantId() == null ? -1L : teacherSubmitReq.getTenantId());
         teacher.setAvatar(Optional.ofNullable(teacherSubmitReq.getAvatar()).orElse(teacher.getAvatar()));
-        if (teacher.getTenantId() == -1L) {
-            teacher.setSettlementFrom(ESettlementFrom.TEACHER);
-        } else if (teacherSubmitReq.getIsSettlement() != null) {
-            teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
-        }
         if (StringUtil.isEmpty(teacherSubmitReq.getTeacherType())) {
             return teacher;
         }