Merge branch 'api' into order_reform

Helius

2021-01-12 a88cf964159303c208d8a3a9d0b8dadef7b1388a

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

@@ -64,7 +64,9 @@

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

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

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

   List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId);
}