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

xiaoyong931011

2020-06-02 d90e8bfffc0bf032499982b83813de307a6749e9

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

@@ -10,7 +10,7 @@
   

   public String generateSimpleSerialno(String userId);



   Result enterTransactionPageOfWalletCoin(String symbol, String type);

   Result enterTransactionPageOfWalletCoin(String symbol);



   Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,

         BigDecimal amount);