DeXun/double-rack
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ruoyi/master'

Browse Source 
# Conflicts:
#	README.md
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
This commit is contained in:
tony
2024-03-12 08:10:01 +08:00
parent b44110eaae d93e2b9df0
commit f4b69ac55a
21 changed files with 193 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -24,9 +24,8 @@
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
<fastjson.version>2.0.43</fastjson.version>
<oshi.version>6.4.8</oshi.version>
<oshi.version>6.4.13</oshi.version>
<commons.io.version>2.13.0</commons.io.version>
<commons.collections.version>3.2.2</commons.collections.version>
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
@@ -108,13 +107,6 @@
<version>${velocity.version}</version>
</dependency>
<!-- collections工具类 -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons.collections.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>