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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

 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;

}