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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-activity/src/main/java/com/dsh/activity/entity/ConsumeDetail.java

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

    private Long dateTime;

}