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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-other/src/main/java/com/dsh/other/model/QueryMySiteVo.java

@@ -35,4 +35,8 @@
    private Integer status;
    @ApiModelProperty("创建时间")
    private Long insertTime;
    @ApiModelProperty("支付方式2玩湃币,其他rmb")
    private Integer payType;
    @ApiModelProperty("1是半场，2 不是")
    private Integer isHalf;
}