Merge branch 'api' into order_reform

Helius

2021-01-06 904bd3f366c32dc5a8a6f092fe1fec192d40fac0

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