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

zxl

5 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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