Merge branch 'master' into test6.9.5

@@ -1191,7 +1191,6 @@ public class ResourcesServiceImpl implements ResourcesService {
         addressArray.add(addAddress("go.share","分享"));
         addressArray.add(addAddress("go.h5","h5网页"));
         addressArray.add(addAddress("go.weblogin","h5网页调用本地登录"));
-        addressArray.add(addAddress("go.guangchannel","逛频道"));
         addressArray.add(addAddress("go.gender","男女首页"));
         addressArray.add(addAddress("go.activity","app活动页"));
         addressArray.add(addAddress("go.home","频道首页"));
@@ -1200,7 +1199,6 @@ public class ResourcesServiceImpl implements ResourcesService {
         addressArray.add(addAddress("go.activitytemplate","活动模板"));
         addressArray.add(addAddress("go.globalpurchase","全球购"));
         addressArray.add(addAddress("go.subchannel","二级频道"));
-        addressArray.add(addAddress("go.guangchannel","逛频道或SHOW晒单页"));
         addressArray.add(addAddress("go.showgoods","去晒单"));
         addressArray.add(addAddress("go.limitpurchase","尖货频道"));
         addressArray.add(addAddress("go.vippro","会员商品"));
@@ -1242,6 +1240,8 @@ public class ResourcesServiceImpl implements ResourcesService {
         addressArray.add(addAddress("go.mineredpackage", "我的红包"));
         addressArray.add(addAddress("go.ufo", "UFO落地页"));
         addressArray.add(addAddress("go.bargainlist", "砍价商品列表"));
+        addressArray.add(addAddress("go.searchlist", "搜索结果页"));
+        addressArray.add(addAddress("go.guangchannel","社区"));
         return addressArray;
     }