Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-26 36e3950ade8195a7d2fcea64c5118e3ddeec8c44

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

@@ -66,6 +66,8 @@

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