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

盲票出票，奖项按数量排序

See merge request quanshu/mp-server!867

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -438,7 +438,8 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
         "盲票生成时，票组状态不是出票中，boxId=" + boxId);
     List<TicketAwards> ticketAwardsList = ticketAwardsService.list(
         new LambdaQueryWrapper<TicketAwards>()
-            .eq(TicketAwards::getBoxId, ticketBox.getBoxId()));
+            .eq(TicketAwards::getBoxId, ticketBox.getBoxId())
+            .orderByAsc(TicketAwards::getQuantity));
     // 分包
     int pkgNum = ticketBox.getPkgQty();
     int pkgUnit = ticketBox.getPkgUnit();