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

luxiaotao1123

2020-07-11 8aef28e39575b910aa08c0c102c868d60fb306ea

 src/main/resources/application.yml

@@ -13,7 +13,7 @@
#    password: xltys1995
    # sql-server
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.2.250:1433;databasename=dlasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=xtyasrs
    username: sa
    password: sa@123
  mvc: