Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-28 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb

 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java

@@ -63,4 +63,8 @@
    private List<ParticipantVo> participant;
    @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
    private Integer status;
    @ApiModelProperty("支付金额")
    private Double payMoney;
    @ApiModelProperty("支付方式（1=微信，2=支付宝，3=玩湃币，4=课时）")
    private Integer payType;
}