Merge remote-tracking branch 'origin/master'

zengh

2022-07-12 63ea601aa950e88237728bf183e30268a3af8616

 src/main/java/org/springblade/modules/system/dto/UserDTO.java

@@ -47,4 +47,6 @@
   private String cardid;

   private String oldCardid;

   private String securityId;
}