Merge branch 'master-stander' into master-jiayan

fwq

2024-09-30 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 phis-download-feign/pom.xml

@@ -6,13 +6,13 @@

    <groupId>com.hz</groupId>
    <artifactId>phis-download-feign</artifactId>
    <version>1.0-SNAPSHOT</version>
    <version>jiayan</version>
    <packaging>jar</packaging>

    <parent>
        <groupId>com.hz</groupId>
        <artifactId>phis-service-feign</artifactId>
        <version>1.0-SNAPSHOT</version>
        <version>jiayan</version>
    </parent>

    <dependencies>
@@ -20,7 +20,6 @@
        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>hx-common</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>

        <dependency>
@@ -33,6 +32,7 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>

        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-loadbalancer</artifactId>