Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
This commit is contained in:
tony
2023-01-01 14:01:42 +08:00
9 changed files with 18 additions and 11 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.8.4</version>
<version>3.8.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>