Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerBirthdayGetVo.java

@@ -13,6 +13,10 @@
@Data
public class MerBirthdayGetVo {


    @ApiModelProperty(value = "生日卡状态1开启2关闭")
    private Integer cardStatus;

    @ApiModelProperty(value = "礼品描述")
    private String giftDesc;