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

无关风月

2025-08-19 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

@@ -16,7 +16,7 @@

/**
 * <p>
 * 惠民卡
 * 玩湃惠民卡
 * </p>
 *
 * @author jqs
@@ -90,7 +90,7 @@
    @TableField("refundStatus")
    private Integer refundStatus;
    /**
     *惠民卡id
     *玩湃惠民卡id
     */
    @TableField("cardId")
    private Integer cardId;