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

优化

See merge request quanshu/mp-server!981

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

@@ -65,8 +65,15 @@ public class ChannelInviteController extends BaseApiController {
 		if (StringUtils.isNotBlank(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, channelAppId);
+		String commRate = jsonObject.getString("commRate");
+		String rst = "";
+		if (StringUtils.isNotBlank(commRate)) {
+			rst = wxUrlLinkService.generateCode("pages/login/invitation", "id=" + channelId + "&type=" + type + "&commRate=" + commRate, channelAppId);
+		} else {
+			rst = wxUrlLinkService.generateCode("pages/login/invitation", "id=" + channelId + "&type=" + type, channelAppId);
+		}
 		channel.setInvitePic(rst);
 		channelService.updateById(channel);
 		return new AjaxResult(Type.SUCCESS, "", rst);