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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

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

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

    private String activityCoverUrl;

    private String activityImgUrl;


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