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

zxl

5 天以前 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

 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("修改成功");
    }