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

peng

4 天以前 bdf04af3958fb7a61f3180aa1efb795ba8ac00d2

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

@@ -18,4 +18,5 @@
    private String prizeCoverUrl;
    private String prizeName;
    private String prizeType;
    private Integer maxPreDay;
}