From 6beb066cae877ac1ec9b3627fc83bab9a018d3cd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 16:32:37 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
index 8a8dbd6..70b7250 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
@@ -25,9 +25,7 @@
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
-import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.SysVipInfo;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -45,11 +43,8 @@
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
-
-import static com.matrix.system.common.constance.AppConstance.SAFEPATH;
/**
* @author 姜ø友瑶
@@ -486,23 +481,6 @@
}
- /**
- * 查询历史搜索人数
- *
- * @return
- * @author luoyuanhong
- */
- @SuppressWarnings("unchecked")
- @RequestMapping(value = "/showHistoryUser")
- public @ResponseBody
- AjaxResult showHistoryUser() {
- if (WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER) != null) {
- return new AjaxResult(AjaxResult.STATUS_SUCCESS,
- (LinkedList<SysVipInfo>) WebUtil.getSession().getAttribute(SystemConstance.HISTORY_CUSTOMER), 0);
- } else {
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, null, 0);
- }
- }
/**
--
Gitblit v1.9.1