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

tangzy

2021-08-22 bb21e20b0542a3f23a12b0811c5e242783108ee5

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

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

   /**
    * 身份证号
    */
   private String idCardNo;
}