Merge branches 'cpv-back' and 'roc-bak' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-11-16 bb34b1893909ac35b9c36c2a87f7127901965d58

 src/main/java/com/xcong/excoin/modules/member/entity/MemberQuickBuySaleEntity.java

@@ -18,7 +18,7 @@
   private static final long serialVersionUID = 1L;



   /**

    * 订单状态 1-新建

    * 订单状态     买入  1-新建     卖出  1-待付款     
    */

   public static final Integer CHARGE_STATUS_CREATE = 1;