From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/resource/controller/AttachController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/resource/controller/AttachController.java b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
index 1b95221..562320a 100644
--- a/src/main/java/org/springblade/modules/resource/controller/AttachController.java
+++ b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
@@ -68,9 +68,10 @@
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入attach")
-	public R<IPage<Attach>> list(Attach attach, Query query, String deptid, String type) {
+	public R<IPage<Attach>> list(Attach attach, Query query, String deptid, String type,String cardid) {
 		attach.setDeptid(deptid);
 		attach.setType(type);
+		attach.setCardid(cardid);
 		IPage<Attach> pages = attachService.page(Condition.getPage(query), Condition.getQueryWrapper(attach));
 		return R.data(pages);
 	}

--
Gitblit v1.9.3