Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/PaymentWorldCup.java

@@ -15,5 +15,7 @@
    private Integer id;
    @ApiModelProperty(value = "支付方式（1=微信，2=支付宝，3=玩湃币，4=课时）")
    private Integer payType;
    @ApiModelProperty(value = "参赛人员")
    @ApiModelProperty(value = "参赛人员id[{\"id\":123,\"isStudent\":1},{\"id\":222,\"isStudent\":0}]", required = true, dataType = "String")
    private String ids;
    private Integer uid;
}