Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2021-02-05 a2db1a0d4f90fdab5e39d3d13a9cc7a4774356df

 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;

   /**

    * 币种

    */