Merge remote-tracking branch 'refs/remotes/ruoyi/master'

# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
This commit is contained in:
zhuyong
2024-09-05 22:35:52 +08:00
50 changed files with 782 additions and 300 deletions

View File

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