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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

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

@@ -9,13 +9,15 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "惠民卡列表VO")
@ApiModel(value = "首页惠民卡列表VO")
public class HuiminCardVO {

    @ApiModelProperty("惠民卡id")
    private Integer id;
    @ApiModelProperty("封面图")
    private String cover;
    @ApiModelProperty("是否购买 0否1是")
    private Integer isBuy;