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

无关风月

2025-04-11 9a60b1e59f52ab4f41e956a76eac1150f39843e3

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java

@@ -171,6 +171,12 @@
    private Long current;
    @TableField(exist = false)
    private Long size;

    /**
     * 已购数量
     */
    @TableField(exist = false)
    private Integer buyCount;
    /**
     * 惠民卡状态：1未开始 2已开始 3已结束
     */