Merge remote-tracking branch 'origin/master'

zengh

2021-08-27 8c28e0e9d71b84eb18a3b40a9afc46ab50269aa2

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

@@ -21,4 +21,8 @@
   )
   private Long value;

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