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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/SurveyScreenResultVo.java

@@ -111,6 +111,8 @@ public class SurveyScreenResultVo{
    @ApiModelProperty("筛查家庭医生姓名")
    private String doctorName;
    @ApiModelProperty("是否是第三方筛查表（0否 1是）")
    private String isThird;
    @ApiModelProperty("第三方筛查结果返回的id")
    private String thirdId;
    @ApiModelProperty("评估来源【1.前台三合一 2. 前台独立 3.后台自动 4.i健康】")
@@ -400,4 +402,12 @@ public class SurveyScreenResultVo{
    public void setThirdAdvice(String thirdAdvice) {
        this.thirdAdvice = thirdAdvice;
    }
    public String getIsThird() {
        return isThird;
    }
    public void setIsThird(String isThird) {
        this.isThird = isThird;
    }
}