Merge remote-tracking branch 'origin/master'

Administrator

2022-03-09 9ec5c36c39d01119918a17f761a49fb133a5c630

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -347,6 +347,9 @@
                user.setHold("2");
            }
        }
        if (user.getHold().equals("2")){
            states = true;
        }

        //如果是离职
        if (null != user.getStatus()) {
@@ -1235,6 +1238,8 @@
                user.setHold("2");
                user.setSecuritynumber(null);
            }
        }else {
            state = true;
        }

        String url = "";