Conflicts:
	pom.xml
This commit is contained in:
疯狂的狮子li
2021-10-19 17:35:16 +08:00
79 changed files with 1607 additions and 582 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>