Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 3530f728388d91b09a62fbd8f82d3a56b1ff265b

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java

@@ -205,7 +205,11 @@

        // 判断账号是否重复
        //Check if the account is duplicated
        User theUser = userService.getByAccount(user.getAccount());
        User theUser = new User();
        if (user.getAccount()!=""){
         theUser = userService.getByAccount(user.getAccount());

        }
        System.out.println("=====theUser======="+theUser);
        if (theUser != null&&user.getAccount()!="") {
            throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);