Merge remote-tracking branch 'origin/master'

liusheng

21 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

 smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java

@@ -29,10 +29,9 @@
    private List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOList;

    @ApiModelProperty(value = "问题回答明细(问卷)")
    List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS;
    private List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS;

    @ApiModelProperty(value = "试卷类型:1 随访   2 问卷")
    private Integer type;


}