From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)

---
 src/main/java/org/springblade/modules/resource/controller/AttachController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 e4a4d54..48e0b34 100644
--- a/src/main/java/org/springblade/modules/resource/controller/AttachController.java
+++ b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
@@ -84,8 +84,8 @@
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入attach")
-	public R<IPage<AttachVO>> page(AttachVO attach, Query query) {
-		IPage<AttachVO> pages = attachService.selectAttachPage(Condition.getPage(query), attach);
+	public R<IPage<AttachVO>> page(AttachVO attach, Query query,String deptid, String type,String cardid) {
+		IPage<AttachVO> pages = attachService.selectAttachPage(Condition.getPage(query), attach,type,cardid);
 		return R.data(pages);
 	}
 

--
Gitblit v1.9.3