冲突提交

@@ -75,7 +75,6 @@ var tableGird = new common.grid({
 
         return obj;
     },
-<<<<<<< HEAD
     columns:[
         {
             display: "名称",
@@ -93,20 +92,6 @@ var tableGird = new common.grid({
                 } else {
                     return '-';
                 }
-=======
-    columns: [{
-        display: "名称",
-        name: "productName"
-    }, {
-        display: "热门排序",
-        name: "hotSort",
-        render: function(item) {
-            if (item.hotFlag) {
-                return ('<input class="order-input width50" data-id="' + item.id + '" data-type="orderBy" type="text" value="' + item.orderBy + '"/>');
-            } else {
-                return '-';
->>>>>>> ab68be0c67e4456aa77357afd5d64fc8218d2b69
-            }
             }
         }, {
         display: "未发售排序",

-exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.2.0","md5":""},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.2.0","md5":""}}
\ No newline at end of file
+exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.2.1","md5":""},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.2.1","md5":""}}
\ No newline at end of file