From 16da0ad1fda1dffa3019425a6887d38ed4217f44 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sun, 10 Jan 2021 14:26:02 +0800 Subject: [PATCH] Merge branch 'api' into order_reform --- zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java | 3 +-- 1 files changed, 1 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..a9e453a 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; /** * -- Gitblit v1.9.1