From 63ea601aa950e88237728bf183e30268a3af8616 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 10:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/dto/UserDTO.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/dto/UserDTO.java b/src/main/java/org/springblade/modules/system/dto/UserDTO.java
index c548510..f610b8a 100644
--- a/src/main/java/org/springblade/modules/system/dto/UserDTO.java
+++ b/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;
 }

--
Gitblit v1.9.3