From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoOrder.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 d197433..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;
@@ -15,6 +17,8 @@
private String createTime; // 鍒涘缓鏃堕棿
@Column(name = "to_click_time")
private String clickTime; // 鐐瑰嚮鏃堕棿
+ @Column(name = "to_pay_time")
+ private String payTime;// 鏀粯鏃堕棿
@Column(name = "to_title")
private String title; // 鍟嗗搧鍚嶇О
@Column(name = "to_auction_id")
@@ -82,7 +86,17 @@
@Column(name = "to_relation_id")
private String relationId;
@Column(name = "to_trade_id")
- private String tradeId;//浜ゆ槗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;
@@ -380,4 +394,12 @@
this.adPositionName = adPositionName;
}
+ public String getPayTime() {
+ return payTime;
+ }
+
+ public void setPayTime(String payTime) {
+ this.payTime = payTime;
+ }
+
}
--
Gitblit v1.8.0