Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

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

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

   private Boolean disabled;
}