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

排序

See merge request quanshu/mp-server!623

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

@@ -48,6 +48,7 @@ public class TicketAwardsPrizeServiceImpl extends ServiceImpl<TicketAwardsPrizeM
             .eq("t1.box_id", boxId)
             .eq("t2.is_deleted", 0)
             .orderByAsc(sortField.toString())
+            .orderByAsc("t1.sort")
             .orderByDesc("t2.sort_weight")
             .orderByDesc("t2.value"));
   }