fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java

@@ -32,4 +32,6 @@


   public Result searchSymbolResultList();



   public void dealEntrustCoinOrder();



}