fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

@@ -50,5 +50,9 @@
    * 状态【0:待审核 1：成功2：失败】

    */

   private int status;

   /**

    * 提币ID

    */

   private Long withdrawId;



}