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

Dev

See merge request quanshu/mp-server!472

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

@@ -64,7 +64,7 @@ public class ChannelTicketController extends BaseApiController {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     Channel channel = channelService.getById(channelId);
     List<Long> channelIds = new ArrayList<>();
-    if (StringUtils.isBlank(channel.getChannelNo())) {
+    if (StringUtils.isNotBlank(channel.getChannelNo())) {
       String[] split = StringUtils.split(channel.getChannelNo(), ".");
       for (String s : split) {
         channelIds.add(Long.valueOf(s));