Merge remote-tracking branch 'origin/master'

# Conflicts: # pom.xml
2024-01-23 15:04:08 +08:00 · 2024-01-23 15:04:08 +08:00 · 80637b0db7
parent 995a45d0ca e5e6622e4d
commit 80637b0db7
1 changed files with 1 additions and 0 deletions
--- a/pom.xml
+++ b/pom.xml
@ -9,6 +9,7 @@
        <artifactId>gunshi-boot</artifactId>
        <version>1.4-SNAPSHOT</version>
    </parent>
+
    <artifactId>gunshi-project-xyt</artifactId>
    <version>1.0-SNAPSHOT</version>