Merge remote-tracking branch 'origin/master'

zengh

2022-07-12 63ea601aa950e88237728bf183e30268a3af8616

 src/main/java/org/springblade/modules/system/vo/DeptVO.java

@@ -80,5 +80,4 @@
    * 机构类型名称
    */
   private String deptCategoryName;

}