Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-06-27 4e60273930b31cc25f7c2a4ab1b7d5a8088a378b

 src/main/resources/application.yml

@@ -15,7 +15,7 @@
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlasrs
    username: sa
    password: sa@123
    password: Qwe!@#123
  mvc:
    static-path-pattern: /**
  redis: