Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

Helius

2021-05-26 65247a73bbeced41f2e4fd1ac3def2170ee98fe9

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

@@ -41,6 +41,13 @@
   private Integer tradeType;

   public static final Integer TRADETYPE_MARKETPRICE = 1;

   public static final Integer TRADETYPE_FIXEDPRICE = 2;

	
   /**

    * 状态  2：撤单3：已成交

    */

   private Integer orderStatus;

   public static final Integer ORDERSTATUS_CANCEL = 2;

   public static final Integer ORDERSTATUS_DONE = 3;

   /**

    * 币种

    */