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

Junjie

3 天以前 ca2a6d455604056ce628f296911f6abac85a7598

 src/main/java/com/zy/system/controller/UserController.java

@@ -120,6 +120,9 @@
        if(user.getRoleId() != null) {
            entity.setRoleId(user.getRoleId());
        }
        if(user.getNickname()!=null) {
            entity.setNickname(user.getNickname());
        }
        userService.updateById(entity);
        return R.ok();
    }