Merge branch 'master' of http://116.62.18.175:6699/r/smartor

liusheng

3 天以前 7a4465ad9ffccaa6d8d9e4545c6d9fce0344ac45

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

@@ -77,5 +77,7 @@
     */
    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish, String patfrom);

    public Map<String, Object> getScriptByCondition(Long taskid, String zyserialnum, String mzserialnum, String tsserialnum);


}