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

peng

5 天以前 f931144c06ce670ee0eb7384ea05cde4c4497dd3

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

@@ -36,7 +36,7 @@

    @TableField("prize_id")
    /** 奖品id */
    private Long prizeId;
    private String prizeId;

    @TableField("prize_name")
    /** 奖品名称 */