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

zxl

1 天以前 c4786844ef75025cd27cc3833a0f7cd86ad80781

 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")