Merge remote-tracking branch 'origin/dev' into dev

peng

3 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

 framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java

@@ -534,10 +534,13 @@
    @Override
    public Result updateMemberNickName(MemberNickNameForm form) {
        Member member = baseMapper.selectById(form.getMemberId());
        boolean update = false;
        if ("微信用户".equals(member.getNickName()) || StringUtils.isBlank(member.getNickName())) {
            member.setNickName(form.getNickName());
            update = true;
        }
        if (update){
            baseMapper.updateById(member);
            return Result.ok().data(member.getNickName());
        }
        return Result.ok().data(member.getNickName());
    }