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

peng

1 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeProbabilityVO.java

@@ -6,6 +6,6 @@

@Data
public class PrizeProbabilityVO {
    private Long prizeId;
    private String activityPrizeRefId;
    private BigDecimal[][] probability;
}