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

渠道邀请码

See merge request quanshu/mp-server!77

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

@@ -17,6 +17,7 @@ import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.channel.service.IChannelUserRelService;
 import com.qs.mp.common.constant.UserConstants;
 import com.qs.mp.common.core.domain.AjaxResult;
+import com.qs.mp.common.core.domain.AjaxResult.Type;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.ChannelCertifyStatusEnum;
 import com.qs.mp.common.enums.ChannelRoleEnum;
@@ -77,13 +78,13 @@ public class ChannelInviteController extends BaseApiController {
 		Long channelId = SecurityUtils.getLoginUser().getChannelId();
 		Channel channel = channelService.getById(channelId);
 		if (StringUtils.isNotBlank(channel.getInvitePic())){
-			return AjaxResult.success(channel.getInvitePic());
+			return new AjaxResult(Type.SUCCESS, "", channel.getInvitePic());
 		}
 		String type = jsonObject.getString("type");
 		String rst = wxUrlLinkService.generateCode("/pages/login/invitation", "id=" + channelId + ",type=" + type);
 		channel.setInvitePic(rst);
 		channelService.updateById(channel);
-		return AjaxResult.success(rst);
+		return new AjaxResult(Type.SUCCESS, "", rst);
 	}
 
 	/**