From c3c0a5dc4c3ccc8af4809aa3c789ffe5028377e4 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 16:30:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index 7906568..bac7d9e 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -19,6 +19,7 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.hive.action.BaseController;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
@@ -165,7 +166,7 @@
if(!DataAuthUtil.hasAllShopAuth()) {
sysVipInfo.setShopId(user.getShopId());
}
-
+ QueryUtil.setQueryLimitCom(sysVipInfo);
return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
}
--
Gitblit v1.9.1