From f4b0bb5dfda8f21409b9eb0b2ee6e436c87475e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 十二月 2018 15:52:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 4742dc8..756805e 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
@@ -26,7 +26,7 @@
public final static int TYPE_TAOBAO = 1;
// 浜笢
public final static int TYPE_JINGDONG = 2;
-
+
@Column(name = "cog_id")
private Long id;
@@ -34,6 +34,10 @@
@Expose
@Column(name = "cog_goods_id")
private String goodsId;
+
+ // 鍟嗗搧鐨勭被鍨�
+ @Column(name = "cog_goods_type")
+ private Integer goodsType;// 绛夊悓浜嶤ommonOrder鐨剆ourceType
// 鏍囬(鍙樺寲鏃舵柊寤�)
@Expose
@@ -54,12 +58,12 @@
@Expose
@Column(name = "cog_shop_id")
private Long shopId;
-
+
// 搴楅摵鍚嶇О
@Expose
@Column(name = "cog_shop_name")
private String shopName;
-
+
// 搴楅摵鐨勭被鍨�
@Expose
@Column(name = "cog_shop_type")
@@ -73,20 +77,18 @@
// 鍒涘缓鏃堕棿
@Column(name = "cog_create_time")
private Date createTime;
-
+
// 鏇存柊鏃堕棿
@Column(name = "cog_update_time")
private Date updateTime;
-
- public CommonOrderGoods(){
-
+ public CommonOrderGoods() {
+
}
-
- public CommonOrderGoods(Long id){
+
+ public CommonOrderGoods(Long id) {
this.id = id;
}
-
public Long getId() {
return id;
@@ -96,6 +98,14 @@
this.id = id;
}
+ public Integer getGoodsType() {
+ return goodsType;
+ }
+
+ public void setGoodsType(Integer goodsType) {
+ this.goodsType = goodsType;
+ }
+
public String getGoodsId() {
return goodsId;
}
--
Gitblit v1.8.0