Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -7,6 +7,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -694,6 +695,11 @@
        if(!comActReserveIndexApplicationVos.isEmpty()){
            easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
        }
        //查询banner
        List<BannerVO> bannerVOS=this.comActEasyPhotoDAO.banner(communityId);
        if(!bannerVOS.isEmpty()){
            easyPhotoRewardVO.setBannerVOS(bannerVOS);
        }
        return R.ok(easyPhotoRewardVO);
    }