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

4 years ago · a68dfbec25
parent 0c5cbcc66a 5a1fa6dcca
commit a68dfbec25
1 changed files with 2 additions and 2 deletions
--- 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"):"";
 	                	}
 	                },
 	                {