合并冲突

app/service/forumThreadService.js

@@ -253,13 +253,8 @@ exports.getThreadById = function(tid, callback) {
 
 //根据ID更新文章
 exports.updateThreadById = function(tid, entity, callback) {
-<<<<<<< HEAD
     var shareEntity = entity.share;
     if (entity.share&&entity.share._id) {
-=======
-    var shareEntity = entity.share || {};
-    if (entity.share && entity.share._id) {
->>>>>>> e42b46aeb7b4668fbbd8ce83714fe83e240ddb29
         entity.share = entity.share._id;
     }else{
         entity.share = '';