Merge branch 'ty_urgent' into test

Helius

2020-12-27 862f4f0942da8033bf49af89eca0055ad8cb4730

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java

@@ -308,5 +308,13 @@
        achieveNewDao.updateAchieveTime(achieveNew);
    }

    @Override
    public List<AchieveNew> findVipConsumeStatisticsList(AchieveNew achieveNew, PaginationVO pageVo) {
        return achieveNewDao.selectVipConsumeStatisticsList(achieveNew, pageVo);
    }

    @Override
    public int findVipConsumeStatisticsTotal(AchieveNew achieveNew) {
        return achieveNewDao.selectVipConsumeStatisticsTotal(achieveNew);
    }
}