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

peng

4 天以前 bdf04af3958fb7a61f3180aa1efb795ba8ac00d2

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

@@ -56,6 +56,16 @@
    @ApiModelProperty("是否开启活动")
    private String enableStatus;

    private String activityCoverUrl;

    private String activityImgUrl;

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

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

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