From 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 17 Jan 2021 11:35:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
index bdae1a1..5a4b4fe 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
@@ -64,7 +64,7 @@
             QueryUtil.setQueryLimitCom(achieveNew);
             achieveNew.setType(rankingDto.getType());
             achieveNew.setDatatime(new Date());
-            List<RankingVo> list = achieveNewDao.selectStaffSaleAchieveRanking(achieveNew);
+            List<RankingVo> list = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
             ajaxResult.setRows(list);
         } else {
             AchieveNew achieveNew = new AchieveNew();

--
Gitblit v1.9.1