Merge branch 'master' into 1027-master

liusheng

8 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

 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);


}