Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
04f5a93a
Commit
04f5a93a
authored
Jun 25, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级pagehelper到最新版1.3.1
parent
751ca906
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
pom.xml
pom.xml
+1
-1
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
.../src/main/java/com/ruoyi/common/core/page/PageDomain.java
+2
-1
ruoyi-ui/vue.config.js
ruoyi-ui/vue.config.js
+1
-1
No files found.
pom.xml
View file @
04f5a93a
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<swagger.version>
3.0.0
</swagger.version>
<swagger.version>
3.0.0
</swagger.version>
<kaptcha.version>
2.3.2
</kaptcha.version>
<kaptcha.version>
2.3.2
</kaptcha.version>
<mybatis-spring-boot.version>
2.1.4
</mybatis-spring-boot.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>
<fastjson.version>
1.2.76
</fastjson.version>
<oshi.version>
5.7.4
</oshi.version>
<oshi.version>
5.7.4
</oshi.version>
<jna.version>
5.8.0
</jna.version>
<jna.version>
5.8.0
</jna.version>
...
...
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
View file @
04f5a93a
...
@@ -67,7 +67,8 @@ public class PageDomain
...
@@ -67,7 +67,8 @@ public class PageDomain
public
void
setIsAsc
(
String
isAsc
)
public
void
setIsAsc
(
String
isAsc
)
{
{
if
(
StringUtils
.
isNotEmpty
(
isAsc
))
{
if
(
StringUtils
.
isNotEmpty
(
isAsc
))
{
// 兼容前端排序类型
// 兼容前端排序类型
if
(
"ascending"
.
equals
(
isAsc
))
if
(
"ascending"
.
equals
(
isAsc
))
{
{
...
...
ruoyi-ui/vue.config.js
View file @
04f5a93a
...
@@ -109,7 +109,7 @@ module.exports = {
...
@@ -109,7 +109,7 @@ module.exports = {
config
.
optimization
.
runtimeChunk
(
'
single
'
),
config
.
optimization
.
runtimeChunk
(
'
single
'
),
{
{
from
:
path
.
resolve
(
__dirname
,
'
./public/robots.txt
'
),
//防爬虫文件
from
:
path
.
resolve
(
__dirname
,
'
./public/robots.txt
'
),
//防爬虫文件
to
:
'
./
'
,
//到根目录下
to
:
'
./
'
//到根目录下
}
}
}
}
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment