Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy...

luxiaotao1123

2020-07-15 05ebcccc2c8099c0252501fea0e1797e5a1361d2

 src/main/resources/application.yml

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