Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

jiangqs

2023-08-06 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f

 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;