Merge branch 'send_coupon' into user_action

peng

2 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

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

@@ -52,7 +52,6 @@
    @ApiModelProperty("是否启用")
    private String status;

    private String material;

    public static ScanPrizeVO getVoByEntity(@NonNull ScanPrize entity, ScanPrizeVO vo) {
        if(vo == null) {