Merge remote-tracking branch 'origin/dev_voice' into dev_voice

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/GovVoiceFeignClient.java

@@ -17,7 +17,8 @@ import java.util.List;
  * @CreateTime 2020/6/2 16:05
  * , url = "localhost:8105"
  */
-@FeignClient(name = ServiceConstant.GOV_VOICE_SERVER, fallback = GovVoiceFeignClientFallBack.class, url = "localhost:8105")
+//@FeignClient(name = ServiceConstant.GOV_VOICE_SERVER, fallback = GovVoiceFeignClientFallBack.class, url = "localhost:8105")
+@FeignClient(name = ServiceConstant.GOV_VOICE_SERVER, fallback = GovVoiceFeignClientFallBack.class)
 public interface GovVoiceFeignClient {
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -14,7 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @CreateTime 2020/6/2 14:05
  *  , url = "localhost:8087"
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "localhost:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
     /**