Merge branch 'dev' into test

@@ -138,7 +138,7 @@ func (l *MiniSubscribeLogic) ReplyComment(conn transaction.Conn, article *domain
 			//评论内容
 			"thing2": &subscribe.DataItem{Value: comment.GetSubscribeMessageContent()},
 			//评论时间
-			"thing3": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
+			"time3": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
 			//评论用户
 			"thing5": &subscribe.DataItem{Value: fromUserName},
 			//备注
@@ -218,7 +218,7 @@ func (l *MiniSubscribeLogic) LikeArticle(conn transaction.Conn, article *domain.
 			//点赞用户
 			"name1": &subscribe.DataItem{Value: userInfo.Name},
 			//点赞时间
-			"data2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
+			"date2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
 			//动态内容
 			"thing8": &subscribe.DataItem{Value: article.GetSubscribeMessageTitle()},
 			//被赞次数
@@ -251,7 +251,7 @@ func (l *MiniSubscribeLogic) LikeComment(conn transaction.Conn, comment *domain.
 			//点赞用户
 			"name1": &subscribe.DataItem{Value: userInfo.Name},
 			//点赞时间
-			"data2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
+			"date2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
 			//动态内容
 			"thing8": &subscribe.DataItem{Value: comment.GetSubscribeMessageContent()},
 			//被赞次数
@@ -292,7 +292,7 @@ func (l *MiniSubscribeLogic) FollowArticle(conn transaction.Conn, article *domai
 					//内容摘要
 					"thing5": &subscribe.DataItem{Value: ""},
 					//发布时间
-					"thing6": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
+					"time6": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
 					//温馨提示
 					"thing3": &subscribe.DataItem{Value: "你关注的人发布了新的帖子"},
 				},