Merge branch 'send_coupon' into user_action

peng

1 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/ScanPrize.java

@@ -32,9 +32,9 @@
    /** 抽奖活动id */
    private String prizeActivityId;

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

    @TableField("generate_status")
    /** 生成状态