From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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