diff --git a/pom.xml b/pom.xml index eb8de11d..c8bc4c43 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 1.8 3.3.0 3.0.0 - 1.2.79 + 1.2.80 1.2.8 5.5.7 4.1.2 diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java index 5264cc66..0b5ddf31 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java @@ -52,7 +52,7 @@ public class DictDetailController { @ApiOperation("查询字典详情") @GetMapping public ResponseEntity getDictDetails(DictDetailQueryCriteria criteria, - @PageableDefault(sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){ + @PageableDefault(sort = {"sort + 0"}, direction = Sort.Direction.ASC) Pageable pageable){ return new ResponseEntity<>(dictDetailService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -60,7 +60,7 @@ public class DictDetailController { @ApiOperation("查询多个字典详情") @GetMapping(value = "/map") public ResponseEntity getDictDetailMaps(DictDetailQueryCriteria criteria, - @PageableDefault(sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){ + @PageableDefault(sort = {"sort + 0"}, direction = Sort.Direction.ASC) Pageable pageable){ String[] names = criteria.getDictName().split(","); Map map = new HashMap<>(names.length); for (String name : names) {