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

Dev

See merge request quanshu/mp-server!49

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

@@ -239,6 +239,7 @@ public class ChannelController extends BaseApiController {
 			}
 		}
 		try {
+			channel.setUserId(oldChannel.getUserId());
 			channelService.updateChannel(channel, mobileChange);
 		} catch (Exception e) {
 			return AjaxResult.error(e.getMessage());