merge

@@ -1251,6 +1251,7 @@ public class ResourcesServiceImpl implements ResourcesService {
         addressArray.add(addAddress("go.zerohelphome","0元助力"));
         addressArray.add(addAddress("go.activity.signin","签到活动"));
         addressArray.add(addAddress("go.flashsale", "每日秒杀"));
+        addressArray.add(addAddress("go.allbrandlist", "全部品牌"));
         return addressArray;
     }
 

@@ -1039,7 +1039,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
             }
         }
         String noteContent = (StringUtils.isBlank(text)||text.length()<15)?text: (StringUtil.substring(text,0,15)+"...");
-        noteContent = StringUtils.isEmpty(noteContent)?"":noteContent;
+        noteContent = StringUtils.isEmpty(noteContent) ?  " ": noteContent;
         long publishTime = Long.valueOf(grassArticleReq.getPublishTime());
         String timeStr = DateUtil.long2DateStr(publishTime , "yyyyMMddHHmm");
         timeStr = timeStr.substring(0,4)+"年"+timeStr.substring(4,6)+"月"+timeStr.substring(6,8)+"日"+

@@ -654,7 +654,6 @@
     function longArticleEditer(data){
         var articleEditer = $("<div id='articleEditer'>").appendTo($(document.body));
         var title =  "编辑";
-
         window.self.paramObject.mkData = data;
         $(articleEditer).myDialog({
             title: title,