Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-21 9e4c8c55fa853f9e4dd98875695460fc4aeeb859

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

@@ -61,8 +61,8 @@

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

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

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

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