Merge remote-tracking branch 'origin/master'

Administrator

2022-03-09 9ec5c36c39d01119918a17f761a49fb133a5c630

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

@@ -38,11 +38,13 @@

   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;
}