From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandShopCahe.java |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandShopCahe.java b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandShopCahe.java
index 782a01a..1b1576d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandShopCahe.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandShopCahe.java
@@ -25,9 +25,6 @@
 	@Field("createTime")
 	private Date createTime;
 	
-	@Field("updateTime")
-	private Date updateTime;
-
 	public String getId() {
 		return id;
 	}
@@ -58,13 +55,5 @@
 
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
 	}
 }

--
Gitblit v1.8.0