Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-14 d20dbd5d97b3f418533d5d23fd337cdec9f95939

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

@@ -258,6 +258,7 @@
        } else {
            one = new Participant();
            BeanUtils.copyProperties(saveParticipant, one);
            one.setInsertTime(new Date());
            this.save(one);
        }
    }
@@ -266,6 +267,10 @@
    public Page<CompetitionUser> getPeopleFromId(Page<UserCompetition> participantPage, Integer id, Integer state) {
        return this.baseMapper.getPeopleFromId(participantPage, id, state);
    }
    @Override
    public  List<CompetitionUser> getPeopleFromId1(Page<UserCompetition> participantPage, Integer id, Integer state) {
        return this.baseMapper.getPeopleFromId1(participantPage, id, state);
    }

    @Override
    public List<CompetitionUser> getPeoples(Integer id, Integer state) {