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

zxl

2 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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

@@ -50,6 +50,10 @@
    @ApiModelProperty("启用状态")
    private String enableStatus;


    @ApiModelProperty("领取状态")
    private String claimStatus;

    @ApiModelProperty("弹窗内容")
    private Boolean popup;
}