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

zxl

3 天以前 46a66503fdee7f153d6578bfe899431fdad63f8c

 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")
    /** 奖品名称 */