Merge remote-tracking branch 'ruoyi/master'

# Conflicts:
#	README.md
#	ruoyi-ui/src/views/index.vue
This commit is contained in:
tony
2023-11-11 07:28:41 +08:00
18 changed files with 181 additions and 39 deletions

View File

@@ -23,8 +23,8 @@
<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.39</fastjson.version>
<oshi.version>6.4.4</oshi.version>
<fastjson.version>2.0.41</fastjson.version>
<oshi.version>6.4.6</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>