Merge branch 'feature/1204-tenant' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TeacherController.java

@@ -163,7 +163,7 @@ public class TeacherController extends BaseController {
     }
 
     @PostMapping("/updateTenant")
-    @ApiOperation(value = "新增或修改", notes = "传入teacher")
+    @ApiOperation(value = "新增或修改机构", notes = "传入teacher")
     @PreAuthorize("@pcs.hasPermissions('teacher/updateTenant')")
     public HttpResponseResult<Boolean> updateTenant(@Valid @RequestBody TeacherWrapper.UpdateTenant updateTenant) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/UserTenantBindRecordWrapper.java

@@ -112,6 +112,9 @@ public class UserTenantBindRecordWrapper {
         @ApiModelProperty("手机号")
         private String phone;
 
+        @ApiModelProperty("性别")
+        private Integer gender;
+
         @ApiModelProperty("小组名称")
         private String tenantGroupName;
 

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

@@ -21,10 +21,11 @@
         ,su.phone_ phone
         ,su.gender_ gender
         ,su.lock_flag_ lockFlag
+        ,su.gender_ gender
         <if test="param.userType == 'TEACHER'">
             ,tc.settlement_from_ settlementFrom
             ,group_concat(tg.name_) tenantGroupName
-            ,tg.id_ tenantGroupId
+            ,group_concat(tg.id_) tenantGroupId
         </if>
         <if test="param.userType == 'STUDENT'">
             ,tg.name_ tenantGroupName