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

zxl

6 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

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

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

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