Merge branch 'ty_urgent' into test

Helius

2020-12-20 4c47534eda0702136016312666b46578bfb6368b

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

@@ -52,6 +52,8 @@
   public List<AchieveNew> findSumDailyInfoNew(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);

   
	
   List<AchieveNew> selectVipConsumeStatisticsList(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);

   int selectVipConsumeStatisticsTotal(@Param("record") AchieveNew achieveNew);
   
}