Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java

@@ -112,4 +112,13 @@
     * @return  List<AppMemberPrizePageVo>
     */
    List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId);

    /**
     * @description  判断生日卡开启状态
     * @author  jqs
     * @date    2023/8/1 15:43
     * @param
     * @return  void
     */
    Integer checkBirthdayCard(Long shopId);
}