Merge remote-tracking branch 'origin/api' into hive2.0

jyy

2021-01-25 be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f

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

@@ -66,7 +66,11 @@

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