Merge remote-tracking branch 'origin/export' into dev

# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml
#	src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java

src/main/resources/application-local.yml

@@ -163,6 +163,7 @@ mconfig:
       rsms: biz-service-ebtp-rsms #评审结构化服务
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
+      usercenter: core-service-usercenter-public #用户中心
 
 
 document:

src/main/resources/application-pro.yml

@@ -166,7 +166,7 @@ mconfig:
       rsms: biz-service-ebtp-rsms #评审结构化服务
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
-
+      usercenter: core-service-usercenter-public #用户中心
 document:
   clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
 

src/main/resources/application-test.yml

@@ -171,7 +171,7 @@ mconfig:
       rsms: biz-service-ebtp-rsms #评审结构化服务
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
-
+      usercenter: core-service-usercenter-public #用户中心
 document:
   clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
 

src/main/resources/application-uat.yml

@@ -169,7 +169,7 @@ mconfig:
       rsms: biz-service-ebtp-rsms #评审结构化服务
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
-
+      usercenter: core-service-usercenter-public #用户中心
 document:
   clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
 

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: test
+    active: uat