From 2b052324a777a5e4c608308bdc2a86ee9844a63f Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 29 Jan 2019 14:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=90=A5=E5=85=BB=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java  | 6 +++---
 .../com/lyms/platform/operate/web/facade/BabyNutritionFacade.java | 5 ++++-
 .../lyms/platform/operate/web/request/BabyNutritionRequest.java   | 8 ++++----
 .../com/lyms/platform/operate/web/result/BabyNutritionResult.java | 6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
index e2eac95..1879cb2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
@@ -28,7 +28,7 @@ public class BabyNutritionModel {
     private Date created;
     private Date modified;
 
-    private Date NutritiTime;
+    private Date nutritiTime;
 
     //主食
     private List<Map> mainFood;
@@ -104,11 +104,11 @@ public class BabyNutritionModel {
     private String feedType;
 
     public Date getNutritiTime() {
-        return NutritiTime;
+        return nutritiTime;
     }
 
     public void setNutritiTime(Date nutritiTime) {
-        NutritiTime = nutritiTime;
+        this.nutritiTime = nutritiTime;
     }
 
     public String getId() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
index 27e8440..d9e9dc7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
@@ -125,7 +125,10 @@ public class BabyNutritionFacade {
         babyQuery.setId(id);
         if (CollectionUtils.isNotEmpty(models))
         {
-            objectResponse.setData(models.get(0));
+            BabyNutritionResult result = new BabyNutritionResult();
+            result.convertToResult(models.get(0));
+
+            objectResponse.setData(result);
         }
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
         objectResponse.setErrormsg("成功");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
index 94c2791..fd71c70 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
@@ -107,7 +107,7 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
     private String feedType;
 
     //营养填写日期
-    private String NutritiTime;
+    private String nutritiTime;
 
 
     @Override
@@ -149,16 +149,16 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
         model.setCook(cook);
         model.setMeal(meal);
         model.setFeedType(feedType);
-        model.setNutritiTime(DateUtil.parseYMD(NutritiTime));
+        model.setNutritiTime(DateUtil.parseYMD(nutritiTime));
         return model;
     }
 
     public String getNutritiTime() {
-        return NutritiTime;
+        return nutritiTime;
     }
 
     public void setNutritiTime(String nutritiTime) {
-        NutritiTime = nutritiTime;
+        this.nutritiTime = nutritiTime;
     }
 
     public String getId() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
index 35b1101..d9bb134 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
@@ -29,7 +29,7 @@ public class BabyNutritionResult {
     private String created;
     private String modified;
 
-    private String NutritiTime;
+    private String nutritiTime;
 
     //主食
     private List<Map> mainFood;
@@ -149,11 +149,11 @@ public class BabyNutritionResult {
     }
 
     public String getNutritiTime() {
-        return NutritiTime;
+        return nutritiTime;
     }
 
     public void setNutritiTime(String nutritiTime) {
-        NutritiTime = nutritiTime;
+        nutritiTime = nutritiTime;
     }
 
     public String getId() {
-- 
1.8.3.1