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

优化

See merge request quanshu/mp-server!621

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -133,6 +133,7 @@ public class UserTicketController extends BaseApiController {
       // 设置奖项标签信息
       QueryWrapper<TicketAwards> queryWrapper = new QueryWrapper<>();
       queryWrapper.eq("box_id",ticketBox.getBoxId());
+      queryWrapper.isNotNull("awards_label");
       queryWrapper.groupBy("awards_label");
       StringBuilder sortField = new StringBuilder("FIELD(awards_label,'");
       int index = 0;