Merge branch 'feature/0721-tenant'

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

@@ -357,8 +357,14 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
             tenantStaffMapper.update(null, Wrappers.<TenantStaff>lambdaUpdate()
                     .set(TenantStaff::getStatus, UserLockFlag.LOCKED)
                     .eq(TenantStaff::getTenantId, updateStatus.getId()));
+        } else {
+            tenantStaffMapper.update(null, Wrappers.<TenantStaff>lambdaUpdate()
+                    .set(TenantStaff::getStatus, UserLockFlag.NORMAL)
+                    .eq(TenantStaff::getTenantId, updateStatus.getId()));
         }
 
+
+
         if (updateStatus.getSettlement() != null) {
             teacherDao.update(null, Wrappers.<Teacher>lambdaUpdate()
                     .set(Teacher::getSettlementFrom, updateStatus.getSettlement())