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

# Conflicts:
#	src/main/resources/application.yml
This commit is contained in:
zhaokaiyao@91isoft.com
2022-01-14 15:37:22 +08:00
+9
View File
@@ -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/