Merge branch 'dev' of trick9191/wlyy2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/survey/WlyySurveyTemplateOptionVO.java

@@ -17,7 +17,7 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
    @ApiModelProperty(value = "选项内容", example = "模块1")
    private String content;//选项内容',
    @ApiModelProperty(value = "是否有备注，0没有，1有", example = "模块1")
    private String haveComment;
    private Integer haveComment;
    @ApiModelProperty(value = "选项说明是否必填（0否 1是）", example = "模块1")
    private Integer isRequired;//选项说明是否必填（0否 1是）',
    @ApiModelProperty(value = "选项分值", example = "模块1")
@@ -34,6 +34,9 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
    @ApiModelProperty(value = "百分比", example = "模块1")
    private String percentage;
    @ApiModelProperty(value = "选项多少人答题", example = "模块1")
    private Integer optCount;
    public String getTemplateCode() {
        return templateCode;
    }
@@ -106,11 +109,11 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
        this.sort = sort;
    }
    public String getHaveComment() {
    public Integer getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(String haveComment) {
    public void setHaveComment(Integer haveComment) {
        this.haveComment = haveComment;
    }
@@ -121,4 +124,12 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
    public void setPercentage(String percentage) {
        this.percentage = percentage;
    }
    public Integer getOptCount() {
        return optCount;
    }
    public void setOptCount(Integer optCount) {
        this.optCount = optCount;
    }
}