From c0f6294b0be6789fddd652f89f820fcf6d5526cf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:32:39 +0800
Subject: [PATCH] 合并代码
---
cloud-server-competition/src/main/java/com/dsh/competition/service/UserCompetitionService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/UserCompetitionService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/UserCompetitionService.java
index 0dc6ffe..b4fcdb5 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/UserCompetitionService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/UserCompetitionService.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.competition.entity.UserCompetition;
-import com.dsh.competition.feignclient.model.PurchaseRecordVo;
+import java.util.Date;
import java.util.List;
/**
@@ -16,6 +16,7 @@
*/
public interface UserCompetitionService extends IService<UserCompetition> {
- List<PurchaseRecordVo> queryDeRecordDetails(Integer appUserId,String startTime, String endTime);
+
+ List<UserCompetition> queryUsersCompetetions(Date startTime, Date endTime ,Integer appUserId, List<Integer> comIds);
}
--
Gitblit v1.7.1