From 445bc7667e9fc0beeb79b6249c956e1bbc9c89db Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 13 Oct 2022 16:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java  | 4 ++--
 .../java/com/epmet/entity/DataSyncRecordDisabilityEntity.java | 4 ++--
 .../com/epmet/service/impl/DataSyncConfigServiceImpl.java     | 4 ++--
 .../src/main/resources/mapper/DataSyncRecordDisabilityDao.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java
index 748a039549..66762c7617 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java
@@ -71,12 +71,12 @@ public class DataSyncRecordDisabilityDTO implements Serializable {
     /**
      * 残疾等级(状况)
      */
-	private String cjzk;
+	private String cjzkCn;
 
     /**
      * 残疾类别
      */
-	private String cjlb;
+	private String cjlbCn;
 
     /**
      * 文化程度
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java
index 810b153665..3ea26e8050 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java
@@ -66,12 +66,12 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity {
     /**
      * 残疾等级(状况)
      */
-	private String cjzk;
+	private String cjzkCn;
 
     /**
      * 残疾类别
      */
-	private String cjlb;
+	private String cjlbCn;
 
     /**
      * 文化程度
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index 8515089201..991884787a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -399,8 +399,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 if (thirdResultObject != null){
                     entity.setMobile(thirdResultObject.getString("phoneNo"));
                     entity.setCardNum(thirdResultObject.getString("cardNum"));
-                    entity.setCjzk(thirdResultObject.getString("idtLevelName"));
-                    entity.setCjlb(thirdResultObject.getString("idtKindName"));
+                    entity.setCjzkCn(thirdResultObject.getString("idtLevelName"));
+                    entity.setCjlbCn(thirdResultObject.getString("idtKindName"));
                     entity.setEduLevel(thirdResultObject.getString("eduLevelName"));
                     entity.setMaritalStatusName(thirdResultObject.getString("marriagerName"));
                     entity.setGuardian(thirdResultObject.getString("guardian"));
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
index 8947f3a5e1..e545808db8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
@@ -14,8 +14,8 @@
         <result property="mobile" column="MOBILE"/>
         <result property="icResiUserId" column="IC_RESI_USER_ID"/>
         <result property="cardNum" column="CARD_NUM"/>
-        <result property="cjzk" column="CJZK"/>
-        <result property="cjlb" column="CJLB"/>
+        <result property="cjzkCn" column="CJZK_CN"/>
+        <result property="cjlbCn" column="CJLB_CN"/>
         <result property="eduLevel" column="EDU_LEVEL"/>
         <result property="maritalStatusName" column="MARITAL_STATUS_NAME"/>
         <result property="mzCn" column="MZ_CN"/>