Merge remote-tracking branch 'origin/master'

liusheng

昨天 d1533f3fe617a98eb8782047e4c4ad81f3924fcf

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

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

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