Merge branch 'ty_urgent' into api

Helius

2020-12-23 844e37605b65a2a3d95b466d663d91ac8584350c

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

@@ -2,13 +2,13 @@

import java.util.List;

import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.bean.SysOrder;
import com.matrix.system.hive.bean.SysProjServices;

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

/**
 *
@@ -113,4 +113,6 @@

   int findVipConsumeStatisticsTotal(AchieveNew achieveNew);

   public UserAchieveVo findUserAchieveByTime(int type);

}