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 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 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() {