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

common/common-entity/src/main/java/com/yihu/es/entity/QuestionnaireWinningESDO.java

@@ -29,6 +29,10 @@ public class QuestionnaireWinningESDO {
	private Integer prizeType;
	//奖品兑奖码
	private String prizeCode;
	//兑奖地址
	private String address;
	//奖品有效期
	private Date validity;
	//0为未删除，1为删除
	private Integer del;
	//0为未中奖，1为已中奖
@@ -136,4 +140,20 @@ public class QuestionnaireWinningESDO {
	public void setWinning(Integer winning) {
		this.winning = winning;
	}
	
	public String getAddress() {
		return address;
	}
	
	public void setAddress(String address) {
		this.address = address;
	}
	
	public Date getValidity() {
		return validity;
	}
	
	public void setValidity(Date validity) {
		this.validity = validity;
	}
}