Merge branch 'master' of https://gitee.com/y_project/RuoYi

2018-10-27 21:39:36 +08:00
parent a44aa5db42 71c3274333
commit 6a4894e9d1
4 changed files with 13 additions and 4 deletions
--- a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html
@ -58,7 +58,7 @@
 	<div th:include="include :: footer"></div>
 	<script th:inline="javascript">
 		var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
-		var datas = [[${@dict.getType('sys_job_status')}]];
+		var datas = [[${@dict.getType('sys_common_status')}]];
 		var prefix = ctx + "monitor/jobLog";

 		$(function() {