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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

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

@@ -19,4 +19,8 @@
    @ApiModelProperty(value = "1充值 2扣除")
    private Integer type;

    private Long time;

    private Long dateTime;

}