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

zxl

2 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

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