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

peng

4 天以前 bdf04af3958fb7a61f3180aa1efb795ba8ac00d2

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

@@ -52,7 +52,7 @@

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


    @TableField("prize_name")