Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-26 c62ecf74d20a4338632e454c4f270a739d3d69a1

 zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java

@@ -64,5 +64,13 @@

   List<OrderDetailAchieveItemVo> selectApiOrderItemAchieve(@Param("itemId") Long itemId);

   List<RankingVo> selectShopConsumeAchieveRanking(AchieveNew achieveNew);
   List<RankingVo> selectShopConsumeAchieveRanking(@Param("record") AchieveNew achieveNew);

   List<RankingVo> selectShopSaleAchieveRanking(@Param("record") AchieveNew achieveNew);

   List<RankingVo> selectBeauticianConsumeAchieveRanking(@Param("record") AchieveNew achieveNew);

   List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId);

   List<RankingVo> selectStaffSaleAchieveRanking(@Param("record") AchieveNew achieveNew);
}