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

935090232@qq.com

2021-10-25 7af9aaa4ef6736d407cc3cbe03beddb8dfd57fe9

 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);