From 3222d83845148e2479af6aeb0f029def5f28f8b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 12:34:53 +0800
Subject: [PATCH] Merge branch 'jc' of http://s16s652780.51mypc.cn:49896/r/zhba_management_w_bf into jc

---
 src/main/java/org/springblade/modules/system/dto/UserDTO.java |    6 ++++--
 1 files changed, 4 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..f3b4788 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,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;
 }

--
Gitblit v1.9.3