From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:24:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

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