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

Administrator

2022-05-23 b7feda7c2cc54e03966ecbd2ed2582097eb3ee73

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

@@ -38,11 +38,15 @@

   private Integer isDeleted;

   private String examinationType;
   private String examination_type;

   private String examinationMx;
   private String examination_mx;

   private String jurisdiction;

   private String cardid;

   private String oldCardid;

   private String securityId;
}