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

peng

5 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

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

@@ -48,6 +48,9 @@
    @ApiModelProperty("奖品图片")
    private String prizeImg;

    private String prizeCoverUrl;

    private String prizeImgUrl;
    public static PrizeDrawVO getVoByEntity(@NonNull PrizeDraw entity, PrizeDrawVO vo) {
        if(vo == null) {
            vo = new PrizeDrawVO();