Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-07 3312b506e4f3a840623071ab56fa8ec68816a811

 src/main/java/com/xcong/excoin/modules/platform/entity/PlatformTradeSettingEntity.java

@@ -40,6 +40,10 @@
     */

    private BigDecimal feeRatio;

    /**

     * 币币手续费率

     */

    private BigDecimal coinFeeRatio;

    /**

     * 代理返佣比例

     */

    private BigDecimal agentReturnRatio;