Merge remote-tracking branch 'origin/zyhy_master'

# Conflicts:
#	pom.xml
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/controller/CoscoSupplierBankController.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/controller/CoscoSupplierSurveyController.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/controller/CoscoSupplierexitController.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/dao/CoscoSupplierBankMapper.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/dao/CoscoSupplierBaseMapper.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/dao/CoscoSupplierexitMapper.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/dao/mapper/BizSupplierAptitudeMapper.xml
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/dao/mapper/CoscoSupplierBankMapper.xml
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/entity/BizSupplierRegister.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/service/ICoscoSupplierBankService.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/service/ICoscoSupplierSurveyService.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/service/ICoscoSupplierexitService.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/service/impl/BizSupplierAptitudeServiceImpl.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/service/impl/BizSupplierBankServiceImpl.java
#	src/main/java/com/chinaunicom/zyhy/ebtp/supplier/bizsupplierregister/service/impl/BizSupplierRegisterServiceImpl.java
#	src/main/resources/application-master.yml

src/main/resources/application.yml

@@ -2,11 +2,6 @@
 app:
   id: biz-supplier-manage
 
-# Apollo 配置信息
-apollo:
-  bootstrap:
-    enabled: true
-    namespace: application
 
 spring:
   profiles: