Merge branch 'master-chw' into dev-chw

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityVo.java

@@ -27,4 +27,5 @@ public class ActivityVo extends Activity {
     private String headimgurl;
     private String realname;
     private String typeName;
+    private Integer imUserid;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityBiz.java

@@ -69,6 +69,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
                     activityVo.setNickname(appUserVo.getNickname());
                     activityVo.setRealname(appUserVo.getRealname());
                     activityVo.setUsername(appUserVo.getUsername());
+                    activityVo.setImUserid(appUserVo.getImUserid());
                 }
             }
         }