From 79fa17366c961ae0a84f975f2a6b6fa49b1f534c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 06 Mar 2024 14:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java
index 73a059d..284a712 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java
@@ -1,10 +1,8 @@
 package cn.gistack.sm.collect.mapper;
 
+import cn.gistack.sm.collect.vo.CollectVO;
 import cn.gistack.sm.collect.entity.UserCollect;
-import cn.gistack.sm.feedback.entity.Feedback;
-import cn.gistack.sm.feedback.vo.FeedbackVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,4 +10,5 @@
 public interface UserCollectMapper extends BaseMapper<UserCollect> {
 	String getMyCollect(@Param("userId") String userId);
 
+    List<CollectVO> getMyCollectVO(@Param("userId") String userId);
 }

--
Gitblit v1.9.3