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

Helius

2021-02-05 311322c7f97dbedb3f51deb99827633252a1f016

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

@@ -143,7 +143,6 @@
    /**

     * 是否是交易员1是2否

     */

    @TableField(exist = false)

    private Integer isTrader;



    /**