From 6a2d3e41099a782770f2aa0f648061ac0bd2d4ce Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Jan 2021 17:23:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
index c5a9c3b..33dfa98 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
@@ -64,5 +64,7 @@
List<OrderDetailAchieveItemVo> selectApiOrderItemAchieve(@Param("itemId") Long itemId);
- List<RankingVo> selectShopConsumeAchieveRanking(AchieveNew achieveNew);
+ List<RankingVo> selectShopConsumeAchieveRanking(@Param("record") AchieveNew achieveNew);
+
+ List<RankingVo> selectBeauticianConsumeAchieveRanking(@Param("record") AchieveNew achieveNew);
}
\ No newline at end of file
--
Gitblit v1.9.1