Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

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

@@ -15,6 +15,9 @@
@Data
public class AppBirthdayCardVo {

    @ApiModelProperty(value = "生日卡是否开启0否1是")
    private Integer checkBirthdayCard;

    @ApiModelProperty(value = "是否有生日0否1是")
    private Integer haveBirthdayFlag;