Merge branch 'master' into SANDBOX

4d0265c7 · strong · 33b7c58c · 8d1972c5 · 4d0265c7
Commit 4d0265c7 authored Dec 02, 2015 by strong
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

forumLog.js app/controllers/admin/forumLog.js +1 -1

No files found.
--- a/app/controllers/admin/forumLog.js
+++ b/app/controllers/admin/forumLog.js
@@ -44,7 +44,7 @@ var aggregate = function(model, match, group_id, sort, callback) {

 //格式化日期 (格式：年-月-日)
 function date_format(date) {
-    return moment(date).format('YYYYMMDD');
+    return moment(date).format('YYYY/MM/DD');
 }

 //获取日期之间所有日期