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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 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;

}