Merge branch 'api' into hive2.0

jyy

2021-03-09 62b534e96922a3911f61845753ee0d126bafd6e1

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

@@ -66,5 +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);
}