Merge branch 'dev' into 'mp-server-test'

渠道邀请码

See merge request quanshu/mp-server!76

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelInviteController.java

@@ -77,7 +77,7 @@ public class ChannelInviteController extends BaseApiController {
 		Long channelId = SecurityUtils.getLoginUser().getChannelId();
 		Channel channel = channelService.getById(channelId);
 		if (StringUtils.isNotBlank(channel.getInvitePic())){
-			return AjaxResult.success(channel.getChannelId());
+			return AjaxResult.success(channel.getInvitePic());
 		}
 		String type = jsonObject.getString("type");
 		String rst = wxUrlLinkService.generateCode("/pages/login/invitation", "id=" + channelId + ",type=" + type);