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

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/resources/application.yml

@@ -10,17 +10,6 @@ swagger:
     - org.springblade
     - com.logpm
 
-#oss配置
-oss:
-  enabled: true
-  name: minio
-  tenant-mode: false
-  endpoint: http://8.137.14.82:9000
-  access-key: minio
-  secret-key: 123123123
-  bucket-name: bladex
-
-
 logging:
   config: classpath:logback.xml
 

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application.yml

@@ -10,21 +10,9 @@ swagger:
     - org.springblade
     - com.logpm
 
-#oss配置
-oss:
-  enabled: true
-  name: minio
-  tenant-mode: false
-  endpoint: http://8.137.14.82:9000
-  access-key: minio
-  secret-key: 123123123
-  bucket-name: bladex
-
-
 logging:
   config: classpath:logback.xml
 
-
 spring:
   main:
     allow-circular-references: true