From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sat, 24 Apr 2021 20:21:24 +0800 Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move --- zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java index 05a4c25..e502b07 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java +++ b/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); + } \ No newline at end of file -- Gitblit v1.9.1