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

# Conflicts: # src/main/resources/application.yml
2022-01-14 15:37:22 +08:00
parent 195a26ccfe 6c050ba6cf
commit 7afd6f37cc
1 changed files with 9 additions and 0 deletions
@@ -109,3 +109,12 @@ webUrl: https://srms.foton.com.cn/#/
 isNotScheduled: true
 buss:
  edit:
    file:
      path: /data/slrs/file/
  down:
    file:
      path: https://srms.foton.com.cn/file/
 #      path: http://foton.natapp1.cc/file/