Merge branch 'dev' of linzhuo/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/education/FoodComp.java

@@ -30,7 +30,7 @@ public class FoodComp extends IdEntity {
	// 成分
	private String component;
	//重量
	private int weight;
	private String weight;
	private String photo;
@@ -74,11 +74,11 @@ public class FoodComp extends IdEntity {
		this.component = component;
	}
	public int getWeight() {
	public String getWeight() {
		return weight;
	}
	public void setWeight(int weight) {
	public void setWeight(String weight) {
		this.weight = weight;
	}
}