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

peng

3 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

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