conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

 src/main/java/com/xcong/excoin/modules/coin/entity/ZhiyaRewardEntity.java

@@ -34,5 +34,9 @@
     * 奖励金额
     */
    private BigDecimal rewardAmout;
    /**
     * 1：返回用户2：返回代理
     */
    private Integer type;

}