Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-16 3a92361f2181c5d6fcd16536f3a9a80c89d193d6

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

@@ -67,4 +67,8 @@
   List<RankingVo> selectShopConsumeAchieveRanking(@Param("record") AchieveNew achieveNew);

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

   List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId);

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