From 6224d1c19b5d92a2e5dd31eaa36d70fdfb0f5243 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 19 Jul 2021 11:55:53 +0800
Subject: [PATCH] 1.新增保安员列表接口 2.行政区tree 接口修改
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 92e82d6..252d559 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -30,10 +30,13 @@
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
+import org.springblade.modules.punish.entity.Punish;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.util.Date;
+import java.util.Map;
/**
* 控制器
@@ -43,7 +46,7 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("blade-permit/permit")
+@RequestMapping("/permit")
@Api(value = "", tags = "接口")
public class PermitController extends BladeController {
@@ -66,8 +69,8 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入permit")
- public R<IPage<Permit>> list(Permit permit, Query query) {
- IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
+ public R<IPage<Permit>> list(@ApiIgnore @RequestParam Map<String, Object> permit, Query query) {
+ IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit, Permit.class));
return R.data(pages);
}
--
Gitblit v1.9.3