Merge branch 'api' into order_reform

Helius

2021-01-12 b8e2c0dee6ae4520a2e0e783b416825d872c8f9e

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