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

# Conflicts:
#	adm-business/adm-diagram/src/main/resources/bootstrap.yml

adm-business/adm-diagram/src/main/resources/bootstrap.yml

@@ -4,6 +4,8 @@ spring:
   application:
     # 应用名称
     name: adm-diagram
+  main:
+    allow-bean-definition-overriding: true
   datasource:
     dynamic:
       datasource:
@@ -39,10 +41,10 @@ persagy:
 #        slf4j:
 #          enabled: true
 
-#config:
-#  file:
-#    absolute:
-#      path: ${CONFIG_FILE_PATH:D:\SpringCloud}
+config:
+  file:
+    absolute:
+      path: ${CONFIG_FILE_PATH:D:\SpringCloud}
 #feign:
 #  compression:
 #    request: