From fed1f885b03a5b4b7c62d44320c3ff2068ca02e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Feb 2021 11:01:24 +0800
Subject: [PATCH] confict

---
 zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 a9e453a..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
@@ -115,4 +115,6 @@
 
 	public UserAchieveVo findUserAchieveByTime(int type);
 
+	public List<AchieveNew> findOrderItemAchieve(Long orderid);
+
 }
\ No newline at end of file

--
Gitblit v1.9.1