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

peng

6 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

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

@@ -534,8 +534,10 @@
    @Override
    public Result updateMemberNickName(MemberNickNameForm form) {
        Member member = baseMapper.selectById(form.getMemberId());
        member.setNickName(form.getNickName());
        baseMapper.updateById(member);
        if ("微信用户".equals(member.getNickName()) || StringUtils.isEmpty(member.getNickName())) {
            member.setNickName(form.getNickName());
            baseMapper.updateById(member);
        }
        return Result.ok("修改成功");
    }