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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

 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;

}