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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

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

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

import java.util.List;

import com.matrix.system.api.vo.UserAchieveVo;
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;

/**
 *
@@ -116,4 +115,6 @@

   public UserAchieveVo findUserAchieveByTime(int type);

   public List<AchieveNew> findOrderItemAchieve(Long orderid);

}