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

无关风月

昨天 2b2e8603381d62b5da4a817710b33d583561ff3f

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

@@ -37,4 +37,6 @@
    private Long insertTime;
    @ApiModelProperty("支付方式2玩湃币,其他rmb")
    private Integer payType;
    @ApiModelProperty("1是半场，2 不是")
    private Integer isHalf;
}