From 4ebe05573f8e1e39f0f05a18c4dfcf6b809b0798 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Thu, 1 Dec 2016 11:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=97=A5=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/ResidentsArchiveModel.java   | 10 +++++-----
 .../java/com/lyms/platform/query/ResidentsArchiveQuery.java  | 10 +++++-----
 .../platform/operate/web/facade/PremaritalCheckupFacade.java |  2 +-
 .../operate/web/request/ResidentsArchiveAddRequest.java      | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
index 2585e6a..5936750 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
@@ -26,7 +26,7 @@ public class ResidentsArchiveModel extends BaseModel{
     //性别
     private String sex;
     //出生日期
-    private String brithDay;
+    private String birthday;
     //国籍
     private String countryId;
     //民族Id
@@ -134,12 +134,12 @@ public class ResidentsArchiveModel extends BaseModel{
         this.sex = sex;
     }
 
-    public String getBrithDay() {
-        return brithDay;
+    public String getBirthday() {
+        return birthday;
     }
 
-    public void setBrithDay(String brithDay) {
-        this.brithDay = brithDay;
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
     }
 
     public String getCountryId() {
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
index d6d3f19..bcdfe25 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
@@ -21,7 +21,7 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative
     //性别
     private String sex;
     //出生日期
-    private Date brithDay;
+    private Date birthday;
     //国籍
     private String countryId;
     //民族Id
@@ -174,12 +174,12 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative
         this.sex = sex;
     }
 
-    public Date getBrithDay() {
-        return brithDay;
+    public Date getBirthday() {
+        return birthday;
     }
 
-    public void setBrithDay(Date brithDay) {
-        this.brithDay = brithDay;
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
     }
 
     public String getCountryId() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index 22bcf42..cdd0038 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -104,7 +104,7 @@ public class PremaritalCheckupFacade {
         archiveMap.put("username",archiveModel.getUsername());
         archiveMap.put("age", archiveModel.getAge());
         archiveMap.put("sex",archiveModel.getSex());
-        archiveMap.put("birthday",getBirthday(archiveModel.getBrithDay()));
+        archiveMap.put("birthday",getBirthday(archiveModel.getBirthday()));
         archiveMap.put("phone",archiveModel.getPhone());
         archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(),archiveModel.getCityId(),
                 archiveModel.getAreaId(),archiveModel.getStreetId(),archiveModel.getAddress(),basicConfigService));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
index b0d0458..654b164 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
@@ -27,7 +27,7 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
     //性别
     private String sex;
     //出生日期
-    private String brithDay;
+    private String birthday;
     //国籍
     private String countryId;
     //民族Id
@@ -99,7 +99,7 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
         model.setId(id);
         model.setUsername(username);
         model.setSex(sex);
-        model.setBrithDay(brithDay);
+        model.setBirthday(birthday);
         model.setCountryId(countryId);
         model.setNationId(nationId);
         model.setMarriageId(marriageId);
@@ -178,12 +178,12 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
         this.sex = sex;
     }
 
-    public String getBrithDay() {
-        return brithDay;
+    public String getBirthday() {
+        return birthday;
     }
 
-    public void setBrithDay(String brithDay) {
-        this.brithDay = brithDay;
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
     }
 
     public String getCountryId() {
-- 
1.8.3.1