Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

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

@@ -8,6 +8,7 @@

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.hive.plugin.util.BaseServices;
import org.apache.ibatis.annotations.Param;

/**
 *
@@ -108,5 +109,8 @@

   public void modifyAchieveTime(AchieveNew achieveNew);

   List<AchieveNew> findVipConsumeStatisticsList(AchieveNew achieveNew, PaginationVO pageVo);

   int findVipConsumeStatisticsTotal(AchieveNew achieveNew);

}