%!s(int64=3) %!d(string=hai) anos · 03cf3e660e
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -14,7 +14,6 @@ spring:
 
				 
			
 
				 openfeign:
			
 
				   # 正式环境
			
 
				-<<<<<<< HEAD
			
 
				   #ESFeign:
			
 
				     #url: ${ESFEIGN_URL:172.16.33.166:8089}
			
 
				   #ColumnDataFeign: