Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

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

   private Boolean disabled;
}