Merge branch 'cmg-basefun-hzqmjk' into master-jiayan-test

fwq

2024-08-19 7232dfe75b210e021a61a4b848bf0e9c951abd0d

 pom.xml

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

    <artifactId>hx-common</artifactId>