Commit 401093b4 authored by jiaorz's avatar jiaorz

Merge remote-tracking branch 'origin/base-modify' into base-modify

parents 921aca6c 4aa03d3b
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<artifactId>spring-boot</artifactId> <artifactId>spring-boot</artifactId>
<version>2.1.3.RELEASE</version> <version>2.1.3.RELEASE</version>
</dependency> </dependency>
<!-- <dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-openfeign-core</artifactId> <artifactId>spring-cloud-openfeign-core</artifactId>
<version>2.1.0.RELEASE</version> <version>2.1.0.RELEASE</version>
...@@ -226,12 +226,12 @@ ...@@ -226,12 +226,12 @@
<artifactId>feign-core</artifactId> <artifactId>feign-core</artifactId>
<version>10.1.0</version> <version>10.1.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency>--> </dependency>
<dependency> <!-- <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>-->
</dependencies> </dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment