Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mk1990

2022-05-05 05a324a07a1848b020a06d671680907f8b92207d

 src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java

@@ -76,7 +76,11 @@
    @PostMapping("/changePassword")
    public String changePassword(@RequestParam String oldPassword, @RequestParam String password){
        // 获取当前登录用户id
        String username = SecurityUtils.getUserInfo().getUsername();
        LoginUser userInfo = SecurityUtils.getUserInfo();
        if (userInfo== null) {
            return "fail";
        }
        String username = userInfo.getUsername();
        LoginUser user = null;
        try {
            user = SecurityUtils.login(username, oldPassword, authenticationManager);