Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-04 60ef8b4a95540dfab9df0447364ee40c18354010

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/UserCompetitionServiceImpl.java

@@ -6,6 +6,7 @@
import com.dsh.competition.service.UserCompetitionService;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;

/**
@@ -21,7 +22,7 @@


    @Override
    public List<UserCompetition> queryUsersCompetetions(Integer appUserId, List<Integer> comIds) {
        return this.baseMapper.queryUsersCompetetions(appUserId,comIds);
    public List<UserCompetition> queryUsersCompetetions(Date startTime, Date endTime , Integer appUserId, List<Integer> comIds) {
        return this.baseMapper.queryUsersCompetetions(startTime,endTime,appUserId,comIds);
    }
}