Merge remote-tracking branch 'origin/master' into master

a68dfbec · xueli.xue · 0c5cbcc6 · 5a1fa6dc · a68dfbec
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

xxl-job-admin/src/main/resources/static/js/joblog.index.1.js xxl-job-admin/src/main/resources/static/js/joblog.index.1.js +2 -2

未找到文件。
--- a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
@@ -116,7 +116,7 @@ $(function() {
 						"data": 'triggerTime',
                        "width":'20%',
 						"render": function ( data, type, row ) {
-							return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
+							return data?moment(data).format("YYYY-MM-DD HH:mm:ss"):"";
 						}
 					},
 					{
@@ -145,7 +145,7 @@ $(function() {
 	                	"data": 'handleTime',
                        "width":'20%',
 	                	"render": function ( data, type, row ) {
-	                		return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
+	                		return data?moment(data).format("YYYY-MM-DD HH:mm:ss"):"";
 	                	}
 	                },
 	                {