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

zxl

2 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

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