From 04f5a93aa86ed2ce884696cb4490e67af54e871b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 25 六月 2021 17:25:49 +0800
Subject: [PATCH] 升级pagehelper到最新版1.3.1
---
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java | 3 ++-
ruoyi-ui/vue.config.js | 2 +-
pom.xml | 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 @@
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
- <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
+ <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
<fastjson.version>1.2.76</fastjson.version>
<oshi.version>5.7.4</oshi.version>
<jna.version>5.8.0</jna.version>
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 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 @@
config.optimization.runtimeChunk('single'),
{
from: path.resolve(__dirname, './public/robots.txt'), //闃茬埇铏枃浠�
- to: './', //鍒版牴鐩綍涓�
+ to: './' //鍒版牴鐩綍涓�
}
}
)
--
Gitblit v1.9.3