From 46df2e1e645e8f2025c1c7d7ae124e61f2d23c96 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 28 Jan 2021 16:13:27 +0800
Subject: [PATCH] 初版
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
index 89e4b28..914a8c2 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -142,11 +142,11 @@
* @return
*/
@PostMapping("/selectList")
- public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
+ public R<IPage<JingdanVO>> selectList(@ApiParam(value = "主键集合", required = true) @RequestParam Query query ,String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(jingdanService.selectList(waringType, beginTime, endTime,addvcd,type));
+ return R.data(jingdanService.selectList(Condition.getPage(query),waringType, beginTime, endTime,addvcd,type));
}
/**
--
Gitblit v1.9.3