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

zxl

9 天以前 8800743a358440dd7e91efe0d5cb9197b2d3b431

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

@@ -35,6 +35,10 @@
    /** 奖品数量 */
    private Integer prizeNum;

    @TableField("max_pre_day")
    /** 每日最大中奖数 */
    private Integer maxPreDay;

    @TableField("prize_probability")
    /** 中将概率 */
    private BigDecimal prizeProbability;