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

peng

昨天 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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