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

zxl

2 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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