Merge remote-tracking branch 'origin/master'

Administrator

2022-07-13 798ab07db6464f24e353dcdf8397506ab246c91d

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

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

   private String oldCardid;

   private String securityId;
}