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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargePayRequest.java

@@ -13,7 +13,7 @@
    @ApiModelProperty(value = "支付方式 1微信 2支付宝")
    private Integer payType;

    @ApiModelProperty(value = "充值类型id")
    private Integer chargeId;
    @ApiModelProperty(value = "充值金额")
    private BigDecimal amount;

}