Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management

tangzy

2021-08-31 94a2d8a816845e2a9e13967dc2b7bde01e35ae37

 src/main/java/org/springblade/modules/resource/controller/AttachController.java

@@ -67,7 +67,9 @@
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入attach")
   public R<IPage<Attach>> list(Attach attach, Query query) {
   public R<IPage<Attach>> list(Attach attach, Query query, String deptid, String type) {
      attach.setDeptid(deptid);
      attach.setType(type);
      IPage<Attach> pages = attachService.page(Condition.getPage(query), Condition.getQueryWrapper(attach));
      return R.data(pages);
   }