From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:13:14 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-competition/src/main/java/com/dsh/competition/mapper/UserCompetitionMapper.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/UserCompetitionMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/UserCompetitionMapper.java
index 62a4713..f499608 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/UserCompetitionMapper.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/UserCompetitionMapper.java
@@ -2,7 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsh.competition.entity.UserCompetition;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,6 +17,10 @@
  */
 public interface UserCompetitionMapper extends BaseMapper<UserCompetition> {
 
-    List<UserCompetition> queryDeRecordDetails(Integer appUserId,List<Integer> collect,String startTime, String endTime);
+
+    List<UserCompetition> queryUsersCompetetions(@Param("startTime") Date startTime,
+                                                 @Param("endTime") Date endTime ,
+                                                 @Param("appUserId") Integer appUserId,
+                                                 @Param("comIds") List<Integer> comIds);
 
 }

--
Gitblit v1.7.1