Merge remote-tracking branch 'origin/master'

钟日健

2021-02-27 b88cc45c2f4be66795df34a3f0bfcba35c7bc912

 blade-service/blade-user/src/main/resources/application-dev.yml

@@ -8,3 +8,11 @@
    url: ${blade.datasource.dev.url}
    username: ${blade.datasource.dev.username}
    password: ${blade.datasource.dev.password}
  oss:
    enabled: true
    name: minio
    tenant-mode: true
    endpoint: http://36.134.81.48:9001
    access-key: minioadmin
    secret-key: minioadmin
    bucket-name: jfpt