From dcd5d07d5d648b48f6f04cd79b6e8c5b780dcff7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 16:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
index 611b1a4..7197bff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
@@ -21,8 +21,10 @@
private Long id;
@Column(name = "sgao_uid")
private UserInfo user;
- @Column(name = "sgao_order_id")
- private Order order;// 璁㈠崟
+ @Column(name = "sgao_order_no")
+ private String orderNo;// 璁㈠崟鍙�
+ @Column(name = "sgao_order_source_type")
+ private Integer orderSourceType;// 璁㈠崟鍙�
@Column(name = "sgao_share_rate")
private BigDecimal shareRate;// 鍒嗕韩姣斾緥
@Column(name = "sgao_create_time")
@@ -38,20 +40,28 @@
this.id = id;
}
+ public String getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
+
+ public Integer getOrderSourceType() {
+ return orderSourceType;
+ }
+
+ public void setOrderSourceType(Integer orderSourceType) {
+ this.orderSourceType = orderSourceType;
+ }
+
public UserInfo getUser() {
return user;
}
public void setUser(UserInfo user) {
this.user = user;
- }
-
- public Order getOrder() {
- return order;
- }
-
- public void setOrder(Order order) {
- this.order = order;
}
public BigDecimal getShareRate() {
--
Gitblit v1.8.0