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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

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

@@ -54,6 +54,11 @@
    /** 奖品id */
    private Long prizeId;


    @TableField("prize_name")
    /** 奖品名称 */
    private String prizeName;

    @TableField("prize_img")
    /** 奖品封面 */
    private String prizeImg;