Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 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;