Merge branch 'api' into order_reform

wzy

2021-01-13 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994

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

@@ -64,5 +64,9 @@

   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);

   List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId);
}