From 1c23d47c352ef57bbd4a59e00d4d5b4585853f1e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 15 十月 2020 09:53:25 +0800
Subject: [PATCH] 拼多多搜索bug
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java
index 9194598..01fc19c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java
@@ -5,13 +5,13 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.redpack.RedPackDetail;
import com.yeshi.fanli.entity.redpack.RedPackWinInvite;
import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum;
@@ -20,7 +20,7 @@
import com.yeshi.fanli.service.inter.redpack.RedPackExchangeService;
import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.vo.redpack.RedPackBalanceVO;
@@ -56,8 +56,8 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- Integer order, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ Integer order, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
@@ -112,7 +112,7 @@
* @param out
*/
@RequestMapping(value = "queryDetail")
- public void queryDetail(String callback, Integer pageIndex, Integer pageSize, String key, Long uid, Integer type,
+ public void queryDetail(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long uid, Integer type,
PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -164,7 +164,7 @@
* @param out
*/
@RequestMapping(value = "queryInviteWin")
- public void queryInviteWin(String callback, Integer pageIndex, Integer pageSize, String key, Integer status,
+ public void queryInviteWin(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer status,
PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
--
Gitblit v1.8.0