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

peng

3 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

 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;
}