Merge branch 'activity' into yunding

Helius

2021-05-14 baaab35e79a61784cde5c6a503eef3114e2169f0

 src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java

@@ -24,5 +24,7 @@

    private BigDecimal calculationPower;

    private BigDecimal salePrice;

    private Integer level;
}