Merge remote-tracking branch 'origin/master'

zhs

15 小时以前 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6

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


}