Merge remote-tracking branch 'origin/jc' into jc

guoshilong

2023-12-04 f6fad9857bddebb5bfaad2074e4be73b9b5abc62

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