Merge remote-tracking branch 'origin/master'

liusheng

10 天以前 274d8e2950e79e73b14783e497cdaf97f7dbb8d3

 smartor/src/main/java/com/smartor/service/IIvrTaskTemplateService.java

@@ -71,7 +71,7 @@
    public int deleteIvrTaskTemplateByID(Long ID);

    /**
     * 查询模板详情根据条件
     * 查询语音任务模板详情根据条件
     */
    public IvrTaskTemplateVO selectInfoByCondition(IvrTaskTemplateVO ivrTaskTemplateVO);
}