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

peng

3 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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