Merge branch 'send_coupon' into user_action

peng

2 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

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

@@ -22,19 +22,19 @@

    /** 店铺id */
    @ApiModelProperty("店铺id")
    private Long storeId;
    private String storeId;

    /** 店铺名称 */
    @ApiModelProperty("店铺名称")
    private Long storeName;
    private String storeName;

    /** 抽奖活动id */
    @ApiModelProperty("抽奖活动id")
    private Long prizeActivityId;
    private String prizeActivityId;

    /** 抽奖活动名称名称 */
    @ApiModelProperty("抽奖活动名称名称")
    private String prizeActivityNmae;
    private String prizeActivityName;

    /** 生成状态 */
    @ApiModelProperty("生成状态")
@@ -52,6 +52,7 @@
    @ApiModelProperty("是否启用")
    private String status;


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