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

无关风月

2025-08-22 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

 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;

}