Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mapper/manage/NewsDao.xml

src/main/resources/application-test.yml

@@ -4,8 +4,8 @@ spring:
         druid:
             driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
             url: jdbc:sqlserver://192.168.0.77:1433;DatabaseName=gs108
-            username: test
-            password: ancc@123
+            username: test1
+            password: test1
             initial-size: 10
             max-active: 100
             min-idle: 10