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

jyy

2021-01-15 1bb16954b0630bd078483c06b26e835918ab7946

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

@@ -52,6 +52,4 @@
   int selectApiBusinessDataTotal(@Param("record") SysBusinessData data);

   List<BusinessesDataShowVo> selectDemo(@Param("list") List<StatisticsTimeDaoParam> timeSpaceParam, @Param("shopId") Long shopId, @Param("companyId") Long companyId);

   List<BusinessesDataShowVo> selectDemo2();
}