From 9d8dfb01ff72c57abad3b80f3d65e81a5354db03 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java b/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java
index 879df46..8418eaf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java
@@ -14,6 +14,7 @@
 	private String redisKey;
 	private ShareSourceTypeEnum source;
 	private Long auctionId;
+	private Integer goodsType;
 	private List<TaoBaoGoodsBrief> listGoodsBrief;
 	private List<Long> listId;
 	
@@ -89,4 +90,12 @@
 		this.listId = listId;
 	}
 
+	public Integer getGoodsType() {
+		return goodsType;
+	}
+
+	public void setGoodsType(Integer goodsType) {
+		this.goodsType = goodsType;
+	}
+
 }

--
Gitblit v1.8.0