Merge remote-tracking branch 'origin/cjh-basefun-回访重构' into master-jiayan-test

rx

2024-09-10 833fde7fb397fa66c9e695e8f9376ee9d5b9723c

 phis-feign/pom.xml

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

    <groupId>com.hz</groupId>
    <artifactId>phis-feign</artifactId>
    <version>1.0-SNAPSHOT</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 +19,6 @@
        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>hx-common</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>

        <dependency>
@@ -28,16 +26,21 @@
            <artifactId>jasypt-spring-boot-starter</artifactId>
        </dependency>

        <!--openfeign的支持-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>

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

        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
        </dependency>

    </dependencies>

    <build>