Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-06-05 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3

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

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