From 5046ecde3cd849511a337e25e13af7df7f1894bc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java
index 515a6a3..d9033fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java
@@ -41,11 +41,11 @@
private Date createTime;// 鍒涘缓鏃堕棿
@Column(name = "tmo_updatetime")
private Date updateTime;// 鏈湴鏇存柊鏃堕棿
-
+ @Column(name = "tmo_settlement")
+ private BigDecimal settlement;// 缁撶畻閲戦
@Transient
private int mate; // 鏄惁宸插尮閰�
-
-
+
public Long getId() {
return id;
}
@@ -54,6 +54,14 @@
this.id = id;
}
+ public BigDecimal getSettlement() {
+ return settlement;
+ }
+
+ public void setSettlement(BigDecimal settlement) {
+ this.settlement = settlement;
+ }
+
public Date getCreateTime() {
return createTime;
}
--
Gitblit v1.8.0