Merge branch 'release/1.1' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.1

# Conflicts:
#	server/interface/store.js

@@ -16,4 +16,11 @@ require('./js/brand/index');
 require('./js/product/add');
 require('./js/product/index');
 
+
+require('./js/store/adminedit');
+require('./js/store/adminindex');
+require('./js/store/examine');
+require('./js/store/indexlist');
+require('./js/store/info');
+
 module.exports = demo;
\ No newline at end of file

 exports.domain = require('../config/common.js').domain;
-
-
-    
 //路由配置
 exports.res = [{
       // 创建店铺页面渲染