Merge remote-tracking branch 'origin/master'

liusheng

20 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

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

@@ -17,7 +17,7 @@
public class ServiceSubTaskMYDAnswerReq {

    @ApiModelProperty(value = "问卷结果")
    private List<SvyLibTemplateScriptVO> svyLibTemplateScriptVOS;
    private List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS;

    @ApiModelProperty(value = "流水号")
    private String serialnum;