Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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

@@ -1020,7 +1020,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
                 } else if (accountTenantTo.getShareTenant() !=null && accountTenantTo.getShareTenant() > 0) {
                     // 分润给机构
                     tenantShare.merge(accountTenantTo.getShareTenant(), shareFee, BigDecimal::add);
-                    tenantdivMap.merge(-1L, shareFee, BigDecimal::subtract);
+//                    tenantdivMap.merge(-1L, shareFee, BigDecimal::subtract);
 
                 } else {
                     // 分润给老师

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

@@ -435,7 +435,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private SysUser updateSysUser(TeacherSubmitReq teacherSubmitReq) {
         //判断手机号
         SysUser sysUser = employeeDao.querySysUserByPhone(teacherSubmitReq.getPhone());
-        if (null != sysUser && !teacherSubmitReq.getUserId().equals(sysUser.getId()) && sysUser.getUserType().contains(ClientEnum.TEACHER.getCode())) {
+        if (null != sysUser && !teacherSubmitReq.getUserId().equals(sysUser.getId())) {
             throw new BizException("该手机号已经被注册");
         }
         sysUser = employeeDao.querySysUserById(teacherSubmitReq.getUserId());