Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

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


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