Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development

Conflicts:
	app/controllers/admin/forumLog.js

app/controllers/admin/forumLog.js

@@ -506,10 +506,7 @@ router.post('/getThreadActionStatistic', function(req, res, next) {
     }
 });
 
-var getUserID = function(user) {
-        return user._id;
-    }
-    //文章性别统计
+//文章性别统计
 router.post('/getThreadSexStatistic', function(req, res, next) {
     // 1.获取文章的创建日期,和今天的日期,转换成日期数组
     var t_id = req.body.t_id;