Merge remote-tracking branch 'origin/master'

netflix-web/src/main/java/com/cyksj/web/controller/manage/form/QuestionnairePromotionController.java

@@ -70,6 +70,7 @@ public class QuestionnairePromotionController {
 				.field(QuestionnaireFieldsView::getTemplateId, byId.getTemplateId())
 				.put("promotion_id", String.format(" and fd.promotion_id = %s", promotionId))
 				.orderBy(QuestionnaireFieldsView::getSorted).asc()
+				.orderBy(QuestionnaireFieldsView::getId).desc()
 				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -217,7 +217,9 @@ public class CmsGoodsDonSkuController {
             String condition = " spec_json not like '%套餐%'";
             builder.put("condition", condition);
         }
-        SearchResult<GoodsDonSku> skuViewList = beanSearcher.search(GoodsDonSku.class, builder.build());
+        SearchResult<GoodsDonSku> skuViewList = beanSearcher.search(GoodsDonSku.class, builder
+                .orderBy(GoodsDonSku::getSorted).orderBy(GoodsDonSku::getCreatedTime).desc()
+                .build());
         skuViewList.getDataList().forEach(sku->{
             if (sku.getIsDp()) {
                 sku.setDpSku(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelation.class, MapUtils.builder()

netflix-web/src/main/java/com/cyksj/web/controller/market/TaskFrontController.java

@@ -66,6 +66,7 @@ public class TaskFrontController {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		SearchResult<TaskFrontView> search = beanSearcher.search(TaskFrontView.class, MapUtils.flatBuilder(request.getParameterMap())
 				.orderBy(TaskFrontView::getSorted).desc()
+				.orderBy(TaskFrontView::getId).desc()
 				.build());
 		search.getDataList().forEach(data -> {
 			marketFrontService.updateTaskStatus(data, userId);