From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoOrder.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoOrder.java
index dcbd8d5..ed2a3fc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoOrder.java
@@ -3,6 +3,8 @@
import java.math.BigDecimal;
import java.util.Date;
+import javax.persistence.Transient;
+
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
@@ -85,6 +87,16 @@
private String relationId;
@Column(name = "to_trade_id")
private String tradeId;// 浜ゆ槗ID
+ @Transient
+ private TaoBaoOrderGoods goods;
+
+ public TaoBaoOrderGoods getGoods() {
+ return goods;
+ }
+
+ public void setGoods(TaoBaoOrderGoods goods) {
+ this.goods = goods;
+ }
public String getTradeId() {
return tradeId;
--
Gitblit v1.8.0