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 1879cb2..db17796 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 @@ -86,19 +86,19 @@ public class BabyNutritionModel { private String drink; //烹调油 - private Map oil; + private String oil; // 烹调油用量 (g/天) private String oilGt; //是否经常食用 - private Map edible; + private String edible; //烹饪方法 - private Map cook; + private String cook; //用餐时长 - private Map meal; + private String meal; //喂养方式 private String feedType; @@ -359,11 +359,11 @@ public class BabyNutritionModel { this.drink = drink; } - public Map getOil() { + public String getOil() { return oil; } - public void setOil(Map oil) { + public void setOil(String oil) { this.oil = oil; } @@ -375,27 +375,27 @@ public class BabyNutritionModel { this.oilGt = oilGt; } - public Map getEdible() { + public String getEdible() { return edible; } - public void setEdible(Map edible) { + public void setEdible(String edible) { this.edible = edible; } - public Map getCook() { + public String getCook() { return cook; } - public void setCook(Map cook) { + public void setCook(String cook) { this.cook = cook; } - public Map getMeal() { + public String getMeal() { return meal; } - public void setMeal(Map meal) { + public void setMeal(String meal) { this.meal = meal; } 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 fd71c70..5011c0b 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BabyNutritionModel; import java.util.Date; @@ -143,11 +144,11 @@ public class BabyNutritionRequest implements IBasicRequestConvert