Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

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

@@ -91,4 +91,6 @@
    IPage<AchieveNewStatisticsVo> achieveNewStatistics(Page<AchieveNewStatisticsVo> page,  @Param("record")AchieveNewStatisticsDto queryDto);

    void setPayMethod(@Param("paymethod") String paymethod, @Param("list")  ArrayList<Long> ids);

    List<RankingVo> selectNumOfPeopleAchieveRanking(@Param("record") AchieveNew achieveNew);
}