Merge branch 'master' of git.yfzx.zjtys.com.cn:matrix/device-back into dev

dev-union/src/main/resources/application.properties

@@ -12,8 +12,8 @@ spring.main.allow-bean-definition-overriding=true
 server.servlet.session.timeout=PT1H
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
-file.path=/Users/zjm/code/test-tu/
-preview.path=http://192.168.102.169:8087/file/
+file.path=/opt/zb
+preview.path=http://192.168.100.247:8087/file/
 useBlockcha=true
 spring.jpa.hibernate.use-new-id-generator-mappings=false