From febf4bc7e2d6313873e53f5b549efef28e4fe4c4 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 2 Dec 2016 16:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BB=BA=E6=A1=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ResidentsArchiveFacade.java    |  2 +-
 .../platform/operate/web/result/ResidentsArchiveResult.java    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
index c1f06fa..baf1c05 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
@@ -351,7 +351,7 @@ public class ResidentsArchiveFacade{
         result.setId(model.getId());
         result.setUsername(model.getUsername());
         result.setSex(model.getSex());
-        result.setBirthDay(model.getBuildDay());
+        result.setBirthday(model.getBirthday());
         result.setCountryId(model.getCountryId());
         result.setNationId(model.getNationId());
         result.setMarriageId(model.getMarriageId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
index d2ff68c..7890c4f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
@@ -17,7 +17,7 @@ public class ResidentsArchiveResult {
     //性别
     private String sex;
     //出生日期
-    private String birthDay;
+    private String birthday;
     //国籍
     private String countryId;
     //民族Id
@@ -115,12 +115,12 @@ public class ResidentsArchiveResult {
         this.sex = sex;
     }
 
-    public String getBirthDay() {
-        return birthDay;
+    public String getBirthday() {
+        return birthday;
     }
 
-    public void setBirthDay(String birthDay) {
-        this.birthDay = birthDay;
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
     }
 
     public String getCountryId() {
-- 
1.8.3.1