Merge remote-tracking branch 'ruoyi/master'

# Conflicts:
#	ruoyi-ui/src/views/tool/build/index.vue
This commit is contained in:
tony
2023-03-26 16:56:15 +08:00
7 changed files with 189 additions and 180 deletions

View File

@@ -23,7 +23,7 @@
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<fastjson.version>2.0.23</fastjson.version>
<fastjson.version>2.0.25</fastjson.version>
<oshi.version>6.4.0</oshi.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.collections.version>3.2.2</commons.collections.version>