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

xiaoyong931011

2020-10-11 13c6892c31496e7e9ac76ca439a09d405834ecfb

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

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

     * 是否是交易员1是2否

     */

    @TableField(exist = false)

    private Integer isTrader;



    /**