Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentHomeVo.java

@@ -78,6 +78,9 @@ public class StudentHomeVo extends Student {
     @ApiModelProperty(value = "学练工具是否有效 0否 1是")
     private YesOrNoEnum tenantAlbumFlag;
 
+    @ApiModelProperty(value = "imToken")
+    private String imToken;
+
     public YesOrNoEnum getTenantAlbumFlag() {
         return tenantAlbumFlag;
     }
@@ -275,4 +278,12 @@ public class StudentHomeVo extends Student {
     public void setImUserId(String imUserId) {
         this.imUserId = imUserId;
     }
+
+    public String getImToken() {
+        return imToken;
+    }
+
+    public void setImToken(String imToken) {
+        this.imToken = imToken;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentVo.java

@@ -65,6 +65,9 @@ public class StudentVo extends Student {
     @ApiModelProperty(value = "发送激活码数量，用于小程序发送激活码时提示重复发送")
     private Integer sendActiveCodeNum;
 
+    @ApiModelProperty(value = "imToken")
+    private String imToken;
+
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }

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

@@ -45,6 +45,7 @@
             u.username_ as username,
             u.gender_ as gender,
             u.birthdate_ as birthdate,
+            u.im_token_ as imToken,
             TIMESTAMPDIFF(YEAR, u.birthdate_, CURDATE()) as age,
             u.phone_ as phone,
             (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,