Merge branch 'master' into hive2.0

wzy

2020-12-14 08e86badef73810418add083b21ba64bff74700c

 zq-erp/src/main/java/com/matrix/system/hive/statistics/StatisticsBusinessDataJob.java

@@ -79,7 +79,7 @@
        Date today = new Date();

        SysBusinessData sysBusinessData = new SysBusinessData();
        sysBusinessData.setTime(today);
        sysBusinessData.setTime(DateUtil.getDateBefore(today,1));
        businessDataDao.deleteByModel(sysBusinessData);

        List<SysShopInfo> sysShopInfos = shopInfoDao.selectShopInfo(null);