Merge remote-tracking branch 'origin/master'

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -142,6 +142,8 @@ public class MirrorController {
             result.putOpt("uid",user.getRelationId());
             result.putOpt("limit",user.getLimitNum());
             result.putOpt("time",user.getLimitTime());
+            result.putOpt("usertoken",user.getUserToken());
+            result.putOpt("expireTime",user.getExpireTime());
             if (user.getRelationId() != null) {
                 GroupsRelation relation = relationMapper.selectById(user.getRelationId());
                 result.putOpt("isVip", relation.getIsVip());