update 合并 dev 处理差异

疯狂的狮子li

2021-12-28 261d9f8ebc1c297fa170d46fe75c349f961fca4e

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

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