Commit e87edd9f authored by strong's avatar strong

Merge branch 'bugfix_0111_comment_time' into SANDBOX

# Conflicts:
#	app/models/forumThread.js
parents f50f72bd a4ecb108
......@@ -118,10 +118,6 @@ var ForumThreadSchema = new Schema({
require: true,
default: 100
},
favor_by: [{ //被收藏用户列表
type: Schema.Types.ObjectId,
ref: 'ForumUser'
}],
new_recommend : { //推荐 0否,1是
type: Number,
require: true,
......@@ -130,6 +126,10 @@ var ForumThreadSchema = new Schema({
new_recommend_time:{//推荐时间
type: Date
},
favor_by: [{ //被收藏用户列表
type: Schema.Types.ObjectId,
ref: 'ForumUser'
}],
isEvent:{//是否活动 0否 1是
type: Number,
require: true,
......
......@@ -12,7 +12,8 @@ var listCommentFields = {
praise_count:1,
comment_count:1,
comments:1,
status:1
status:1,
created:1
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment