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

peng

5 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

 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;
}