Merge branch 'master-stander' into master-jiayan-test

fhx

2024-08-16 c7b09c36a2b7082a57c776496b69b4173b4a1007

 pom.xml

@@ -16,7 +16,7 @@
    <parent>
        <groupId>com.hx.gitee</groupId>
        <artifactId>hx-parent</artifactId>
        <version>stander</version>
        <version>jiayan</version>
        <relativePath/>
    </parent>

@@ -25,7 +25,7 @@
            <dependency>
                <groupId>com.hx.gitee</groupId>
                <artifactId>hx-common</artifactId>
                <version>stander</version>
                <version>jiayan</version>
            </dependency>
        </dependencies>
    </dependencyManagement>