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

awards_label 不为空字符串

See merge request quanshu/mp-server!625

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

@@ -134,6 +134,7 @@ public class UserTicketController extends BaseApiController {
       QueryWrapper<TicketAwards> queryWrapper = new QueryWrapper<>();
       queryWrapper.eq("box_id",ticketBox.getBoxId());
       queryWrapper.isNotNull("awards_label");
+      queryWrapper.ne("awards_label", "");
       queryWrapper.groupBy("awards_label");
       StringBuilder sortField = new StringBuilder("FIELD(awards_label,'");
       int index = 0;