Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/cho...

gao

2020-05-22 4c0935d38fc3b8a04cbee29072ce28b8301f73f4

 src/main/java/com/xcong/excoin/configurations/interceptor/MybatisInterceptor.java

@@ -79,8 +79,9 @@
        if (o instanceof BaseEntity) {
            BaseEntity baseEntity = (BaseEntity) o;
            if (member != null) {
                baseEntity.setCreateBy(member.getUsername());
                baseEntity.setUpdateBy(member.getUsername());
                String by = member.getPhone() != null ? member.getPhone() : member.getEmail();
                baseEntity.setCreateBy(by);
                baseEntity.setUpdateBy(by);
            } else {
                baseEntity.setCreateBy(AppContants.SYSTEM_USER);
                baseEntity.setUpdateBy(AppContants.SYSTEM_USER);
@@ -95,7 +96,8 @@
        if (o instanceof BaseEntity) {
            BaseEntity baseEntity = (BaseEntity) o;
            if (member != null) {
                baseEntity.setUpdateBy(member.getUsername());
                String by = member.getPhone() != null ? member.getPhone() : member.getEmail();
                baseEntity.setUpdateBy(by);
            } else {
                baseEntity.setUpdateBy(AppContants.SYSTEM_USER);
            }