Merge branch 'send_coupon' into user_action

peng

2 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java

@@ -60,6 +60,11 @@

    private String activityImgUrl;

    //是否能设置奖品
    private boolean canSet;

    //是否是弹窗活动
    private Boolean popup;

    public static PrizeActivityVO getVoByEntity(@NonNull PrizeActivity entity, PrizeActivityVO vo) {
        if(vo == null) {