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

@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>3.8.4</version>
<version>3.8.5</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
<ruoyi.version>3.8.4</ruoyi.version>
<ruoyi.version>3.8.5</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>