Merge branch 'test6.9.1' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into test6.9.1

@@ -95,7 +95,7 @@ var g = new common.grid({
                 return "";
             }
             var HtmArr = [];
-            HtmArr.push('<a href="/promotionInfo/edit/' + items.id + '"" class="btn btn-info btn-xs">编辑</a>');
+            HtmArr.push('<a target="_blank" href="/promotionInfo/edit/' + items.id + '"" class="btn btn-info btn-xs">编辑</a>');
             if(items.isDel==="N"){
                 HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs del-promotion">删除</a>'); 
             }