Merge remote-tracking branch 'origin/master'

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

src/main/java/io/office/modules/manage/controller/NewsController.java

@@ -597,7 +597,7 @@ public class NewsController extends AbstractController {
     //首页商品二维码在零售领域的应用
     @Login
     @PostMapping("/api/retailCodeList")
-    // @RequiresPermissions("manage:news:list")
+    // @RequiresPermissions("manage:news:list") 
     public R retailCodeTop6List(@RequestBody Map<String, String> params) {
 
         QueryWrapper<NewsEntity> queryWrapper = new QueryWrapper<>();

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