allied-creation / sumifcc-discuss · 提交

转到一个项目

作者 zhuangmx
提交 35f8ddecadf8305068379da25a3ee61a1bdc22ca 2 个父辈 1c0c80c6 dca5ac95

Merge branch 'dev' into test

内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 4 行删除
@@ -138,7 +138,7 @@ func (l *MiniSubscribeLogic) ReplyComment(conn transaction.Conn, article *domain @@ -138,7 +138,7 @@ func (l *MiniSubscribeLogic) ReplyComment(conn transaction.Conn, article *domain
138 //评论内容 138 //评论内容
139 "thing2": &subscribe.DataItem{Value: comment.GetSubscribeMessageContent()}, 139 "thing2": &subscribe.DataItem{Value: comment.GetSubscribeMessageContent()},
140 //评论时间 140 //评论时间
141 - "thing3": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")}, 141 + "time3": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
142 //评论用户 142 //评论用户
143 "thing5": &subscribe.DataItem{Value: fromUserName}, 143 "thing5": &subscribe.DataItem{Value: fromUserName},
144 //备注 144 //备注
@@ -218,7 +218,7 @@ func (l *MiniSubscribeLogic) LikeArticle(conn transaction.Conn, article *domain. @@ -218,7 +218,7 @@ func (l *MiniSubscribeLogic) LikeArticle(conn transaction.Conn, article *domain.
218 //点赞用户 218 //点赞用户
219 "name1": &subscribe.DataItem{Value: userInfo.Name}, 219 "name1": &subscribe.DataItem{Value: userInfo.Name},
220 //点赞时间 220 //点赞时间
221 - "data2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")}, 221 + "date2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
222 //动态内容 222 //动态内容
223 "thing8": &subscribe.DataItem{Value: article.GetSubscribeMessageTitle()}, 223 "thing8": &subscribe.DataItem{Value: article.GetSubscribeMessageTitle()},
224 //被赞次数 224 //被赞次数
@@ -251,7 +251,7 @@ func (l *MiniSubscribeLogic) LikeComment(conn transaction.Conn, comment *domain. @@ -251,7 +251,7 @@ func (l *MiniSubscribeLogic) LikeComment(conn transaction.Conn, comment *domain.
251 //点赞用户 251 //点赞用户
252 "name1": &subscribe.DataItem{Value: userInfo.Name}, 252 "name1": &subscribe.DataItem{Value: userInfo.Name},
253 //点赞时间 253 //点赞时间
254 - "data2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")}, 254 + "date2": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
255 //动态内容 255 //动态内容
256 "thing8": &subscribe.DataItem{Value: comment.GetSubscribeMessageContent()}, 256 "thing8": &subscribe.DataItem{Value: comment.GetSubscribeMessageContent()},
257 //被赞次数 257 //被赞次数
@@ -292,7 +292,7 @@ func (l *MiniSubscribeLogic) FollowArticle(conn transaction.Conn, article *domai @@ -292,7 +292,7 @@ func (l *MiniSubscribeLogic) FollowArticle(conn transaction.Conn, article *domai
292 //内容摘要 292 //内容摘要
293 "thing5": &subscribe.DataItem{Value: ""}, 293 "thing5": &subscribe.DataItem{Value: ""},
294 //发布时间 294 //发布时间
295 - "thing6": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")}, 295 + "time6": &subscribe.DataItem{Value: time.Now().Format("2006-01-02 15:04:05")},
296 //温馨提示 296 //温馨提示
297 "thing3": &subscribe.DataItem{Value: "你关注的人发布了新的帖子"}, 297 "thing3": &subscribe.DataItem{Value: "你关注的人发布了新的帖子"},
298 }, 298 },