Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 6381bb6b6422c23ee4801895019f1a432903fbe8

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java

@@ -214,7 +214,7 @@
            log.error("getScriptInfoByCondition报错了：{}", e.getMessage());
        }

        log.error("tid和pid的值为：{},{}", tid, pid);
        log.info("tid和pid的值为：{},{}", tid, pid);
        if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
        return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom()));
    }