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/ConsumeDetail.java

@@ -16,4 +16,7 @@
    @ApiModelProperty(value = "金额 例如 -90 ")
    private String consumeAmount;

    @ApiModelProperty(value = "1充值 2扣除")
    private Integer type;

}