From 04f5a93aa86ed2ce884696cb4490e67af54e871b Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 25 Jun 2021 17:25:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7pagehelper=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=881.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../src/main/java/com/ruoyi/common/core/page/PageDomain.java | 3 ++- ruoyi-ui/vue.config.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 526c269..456b148 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 3.0.0 2.3.2 2.1.4 - 1.3.0 + 1.3.1 1.2.76 5.7.4 5.8.0 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java index 40a9732..b9d5e6e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java @@ -67,7 +67,8 @@ public class PageDomain public void setIsAsc(String isAsc) { - if (StringUtils.isNotEmpty(isAsc)) { + if (StringUtils.isNotEmpty(isAsc)) + { // 兼容前端排序类型 if ("ascending".equals(isAsc)) { diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index f119c43..7670746 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -109,7 +109,7 @@ module.exports = { config.optimization.runtimeChunk('single'), { from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './', //到根目录下 + to: './' //到根目录下 } } )