Merge remote-tracking branch 'origin/master'

linwe

2024-06-04 1ab597c3027cec9c1a4ba603d18fc1f6870ed865

 src/main/java/org/springblade/modules/system/node/DeptUserTreeNode.java

@@ -21,4 +21,6 @@
    * 是人还是部门  1：部门  2：人
    */
   private String isMan;

   private Boolean disabled;
}