Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantUnbindRecordMapper.xml

@@ -28,9 +28,10 @@
         ,ti.region_code_ as regionCode
         ,ti.username_ as tenantUserName
         ,ti.phone_ as tenantUserPhone
-        ,su.avatar_ as avatar
+        ,te.avatar_ as avatar
         FROM tenant_unbind_record t
         LEFT JOIN tenant_info ti ON ti.id_ = t.tenant_id_
+        LEFT JOIN teacher te on te.user_id_ = t.user_id_
         <where>
             <if test="param.keyword != null and param.keyword.trim() != ''">
                 AND (

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -109,7 +109,8 @@ public class OpenStudentController extends BaseController {
                     throw new BizException("该手机号已经注册为平台学生");
                 }
                 if (one.getTenantId().equals(tenantId)) {
-                    throw new BizException("已经注册当前机构，请勿重复注册");
+                    //已经注册当前机构，请勿重复注册
+                    throw new BizException(5004, tenantInfo.getName());
                 }
                 // 转到其他机构
                 if ((student.getUpdateTenant() == null ||