From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
index 16eb390..7552f75 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
@@ -86,6 +86,11 @@
 	@Column(name = "cog_update_time")
 	private Date updateTime;
 
+	// 鍒嗙被
+	private String category1;
+	private String category2;
+	private String category3;
+	
 	public CommonOrderGoods() {
 
 	}
@@ -198,4 +203,28 @@
 		this.actualPrice = actualPrice;
 	}
 
+	public String getCategory1() {
+		return category1;
+	}
+
+	public void setCategory1(String category1) {
+		this.category1 = category1;
+	}
+
+	public String getCategory2() {
+		return category2;
+	}
+
+	public void setCategory2(String category2) {
+		this.category2 = category2;
+	}
+
+	public String getCategory3() {
+		return category3;
+	}
+
+	public void setCategory3(String category3) {
+		this.category3 = category3;
+	}
+	
 }

--
Gitblit v1.8.0