Merge branch 'mp-server-test' into dev

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

@@ -55,7 +55,7 @@ public class MarketingHitPrizeController extends BaseApiController {
         startPage();
         QueryWrapper<MarketingHitPrize> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("t1.marketing_id",userMarketingHitPrizeQueryParam.getMarketingId());
-        queryWrapper.orderByAsc("t2.sort");
+        queryWrapper.orderByAsc("t2.sort", "t1.id");
         List<UserMarketingHitPrizeListVO> marketingHitPrizeListVOList = marketingHitPrizeService.listHitPrizeByQueryWrapper(queryWrapper);
         if (CollectionUtils.isNotEmpty(marketingHitPrizeListVOList)) {
             for (UserMarketingHitPrizeListVO userMarketingHitPrizeListVO : marketingHitPrizeListVOList) {