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

huliguo

2 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

@@ -701,7 +701,7 @@
            for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
                Integer giftType = appMemberPrizePageVo.getGiftType();
                String prizeFrom = appMemberPrizePageVo.getPrizeFrom();
                if ("抽奖".equals(prizeFrom) && (giftType == 2 || giftType == 4)) {
                if ("抽奖".equals(prizeFrom) && (null != giftType && (giftType == 2 || giftType == 4))) {
                    appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
                }
                if (appMemberPrizePageVo.getShopId() != null) {