Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-07-30 780ec2ea0b558c5603012abbfb8c1fa9845e6734

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

@@ -20,5 +20,4 @@
      using = ToStringSerializer.class
   )
   private Long value;

}