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

peng

6 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

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