Merge branch 'dev_decorator_list' into grey

@@ -5,7 +5,7 @@
 
 		findShopsDecorator:{
 			title:"店铺装修列表",
-			url:"/ShopsDecoratorRest/findShopsDecorator",
+			url:"/ShopsDecoratorRest/findShopsDecorator2",
 			params: [
 				{name: 'page', type: 'number'}, 
 				{name: 'size', type: 'number'}, 

@@ -42,7 +42,7 @@ var g = new common.grid({
 		name: "shopsId"
 	}, {
 		display: "店铺名称",
-		name: "shopsName"
+		name: "shopName"
 	}, {
 		display: "包含品牌",
 		name: "brands",
@@ -60,24 +60,24 @@ var g = new common.grid({
 		}
 	}, {
 		display: "创建时间",
-		name: "createTime"
-		// render: function(item) {
-		// 	if (item.createTime) {
-		// 		return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
-		// 	} else {
-		// 		return '';
-		// 	}
-		// }
+		name: "createTime",
+		render: function(item) {
+			if (item.createTime) {
+				return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
+			} else {
+				return '';
+			}
+		}
 	}, {
 		display: "更新时间",
-		name: "updateTime"
-		// render: function(item) {
-		// 	if (item.updateTime) {
-		// 		return common.util.__dateFormat(new Date(item.updateTime * 1000), "yyyy-MM-dd hh:mm:ss");
-		// 	} else {
-		// 		return '';
-		// 	}
-		// }
+		name: "updateTime",
+		render: function(item) {
+			if (item.updateTime) {
+				return common.util.__dateFormat(new Date(item.updateTime * 1000), "yyyy-MM-dd hh:mm:ss");
+			} else {
+				return '';
+			}
+		}
 	}, {
 		display: "有货状态",
 		name: "checkStatus",
@@ -213,4 +213,4 @@ $(document).on('click', '.closeshops_blk', function() {
 $(document).on('click', '.openshops_blk', function() {
 	var item=g.rows[$(this).data("index")];
 	Bll.toast("确定要开启此BLK店铺吗？","/supplier/store/openBlkShops",item.shopsId);
-});
\ No newline at end of file
+});