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

luofl

2025-04-11 a9edc2f62628007e2c5e86d416d484780238f13f

 cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardVO.java

@@ -27,7 +27,7 @@
    private Integer isExpire;
    @ApiModelProperty("是否可以退款 0否1是")
    private Integer isRefund;
    @ApiModelProperty("状态 前端忽略")
    @ApiModelProperty("状态1待支付2使用中3已退款")
    private Integer status;
    @ApiModelProperty("有效期至")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")