Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-28 f5f16aac96772c109658b5ae1b48874008e0959a

 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java

@@ -59,7 +59,7 @@
   @ApiOperation("自定义分页查询")
   @SaCheckPermission("demo:demo:list")
   @GetMapping("/page")
   public TableDataInfo<TestDemoVo> page(@Validated TestDemoBo bo) {
   public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo) {
      return iTestDemoService.customPageList(bo);
   }