Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
master
李一帆 2024-01-23 15:04:08 +08:00
commit 80637b0db7
1 changed files with 1 additions and 0 deletions

View File

@ -9,6 +9,7 @@
<artifactId>gunshi-boot</artifactId> <artifactId>gunshi-boot</artifactId>
<version>1.4-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
</parent> </parent>
<artifactId>gunshi-project-xyt</artifactId> <artifactId>gunshi-project-xyt</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>