From 6d1d7d6dd2a59345adde1564ae4c2894b77dbe10 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Mon, 11 Apr 2022 18:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E4=B8=BA1.2.80,?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8=E6=8E=92=E5=BA=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../co/yixiang/modules/system/rest/DictDetailController.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index eb8de11d..c8bc4c43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <java.version>1.8</java.version>
         <jedis.version>3.3.0</jedis.version>
         <swagger.version>3.0.0</swagger.version>
-        <fastjson.version>1.2.79</fastjson.version>
+        <fastjson.version>1.2.80</fastjson.version>
         <druid.version>1.2.8</druid.version>
         <hutool.version>5.5.7</hutool.version>
         <poi.version>4.1.2</poi.version>
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<Object> 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<Object> 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<String,Object> map = new HashMap<>(names.length);
         for (String name : names) {