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

xiaoyong931011

2020-06-02 d90e8bfffc0bf032499982b83813de307a6749e9

 src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java

@@ -726,7 +726,7 @@
            if (type == 1) {//开仓
                agent.setOpeningFeeAmount(order.getOpeningFeeAmount());
            } else if (type == 2) {//平仓
                agent.setClosingFeeAmount(order.getOpeningFeeAmount());
                agent.setClosingFeeAmount(order.getClosingFeeAmount());
            } else {//持仓费
                agent.setHoldingFeeAmount(order.getHoldAmount());
            }