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

935090232@qq.com

2021-01-06 7b9cb4464cf7a6db758214c5681b0ecdf01e3db4

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

@@ -46,4 +46,6 @@
   OrderDetailVo selectApiOrderDetailById(@Param("orderId") Long orderId);

   List<RankingVo> selectShopAchieveRanking(@Param("record") SysOrder sysOrder);

   List<RankingVo> selectStaffSaleAchieveRanking(@Param("record") SysOrder sysOrder);
}