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 | 3 ++- 1 files changed, 2 insertions(+), 1 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 386cfad..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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.competition.entity.UserCompetition; +import java.util.Date; import java.util.List; /** @@ -16,6 +17,6 @@ public interface UserCompetitionService extends IService<UserCompetition> { - List<UserCompetition> queryUsersCompetetions(Integer appUserId, List<Integer> comIds); + List<UserCompetition> queryUsersCompetetions(Date startTime, Date endTime ,Integer appUserId, List<Integer> comIds); } -- Gitblit v1.7.1