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

935090232@qq.com

2021-01-15 19fb7fa1fdbcee7cecfee1554610bb40f40e2976

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

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

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

   List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId);
}