Merge branch 'Gabriel_0831' into SANDBOX

app/controllers/mobile/forumInfo.js

@@ -483,7 +483,7 @@ router.get('/info/:fid/serachThreads', function(req, res, next) {
                     };
                 }
                 //获取子话题数据
-                forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-praise_count', function(err, results) {
+                forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-created', function(err, results) {
                     if (err) {
                         console.error(err);
                         res.json(returnCode.BUSY);

app/service/forumThreadService.js

@@ -642,7 +642,7 @@ function getAllThreadByFidHelp(conditions, pageNo, pageSize, sort, callback) {
                 path: 'comments',
                 options: {
                     where:{status:1},
-                    limit: 5,
+                    limit: 3,
                     sort: '-created'
                 },
                 select: 'from to created content level'