From 2b28fcd6a5fac1dd55ceaab76af9a6a66bfbb1ce Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Thu, 23 Apr 2020 15:55:05 +0800
Subject: [PATCH] =?UTF-8?q?FeignClientFallBack=E6=B7=BB=E5=8A=A0getCustome?=
 =?UTF-8?q?rStaffInfoByUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/fallback/EpmetUserFeignClientFallback.java  | 1 -
 .../gov-org/gov-org-server/src/main/resources/bootstrap.yml     | 2 +-
 epmet-user/epmet-user-server/src/main/resources/bootstrap.yml   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
index cb70ad18d3..05b26449b3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
@@ -21,7 +21,6 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfoByUserId", formDTO);
     }
-
     @Override
     public Result<List<StaffGridListDTO>> getStaffGridList(List<CustomerStaffGridDTO> customerStaffGridDTOS) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffGridList", customerStaffGridDTOS);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
index 3d1fddbaef..756bf6874f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
@@ -10,7 +10,7 @@ spring:
     name: gov-org-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active: dev-local
   messages:
     encoding: UTF-8
     basename: i18n/messages_common
diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
index 6674d13dfd..96d9187fb7 100644
--- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
+++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
@@ -10,7 +10,7 @@ spring:
     name: epmet-user-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active: dev-local
   messages:
     encoding: UTF-8
     basename: i18n/messages_common