Merge branch 'dev' into send_coupon

peng

4 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 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();