Merge branch 'master' into docker_package

2022-07-14 14:13:56 +08:00 · 2022-07-14 14:13:56 +08:00 · 29d8975c87
parent 23b16f1c3e c1e165135b
commit 29d8975c87
1 changed files with 1 additions and 1 deletions
--- a/renren-admin/src/main/resources/application.yml
+++ b/renren-admin/src/main/resources/application.yml
@ -55,7 +55,7 @@ spring:
  activiti:
    check-process-definitions: false
  resources:
-    static-locations: classpath:/static,classpath:/public,file:${resource.path}
+    static-locations: classpath:/static,classpath:/public,file:${resource.path},file:${resource.devModelFilePath}
  flyway:
    enabled: true
    locations: filesystem:config/db