Merge branch 'master' into 1027-master

liusheng

8 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

 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;