Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;