Merge remote-tracking branch 'origin/master'

# Conflicts:
#	springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
This commit is contained in:
曾文豪
2024-09-18 14:53:10 +08:00
13 changed files with 26 additions and 27 deletions

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.4</version>
<version>2.0.5</version>
</parent>
<artifactId>springboot-role</artifactId>