From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/order/HongBaoOrder.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/HongBaoOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/HongBaoOrder.java
index 4d2d5a2..f20c22a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/HongBaoOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/HongBaoOrder.java
@@ -27,7 +27,7 @@
// 绾㈠寘ID
@Column(name = "ho_hongbao_id")
private HongBaoV2 hongBaoV2;
-
+
// 璁㈠崟ID
@Column(name = "ho_order_id")
private CommonOrder commonOrder;
@@ -35,12 +35,16 @@
// 鍒涘缓鏃堕棿
@Column(name = "cog_create_time")
private Date createTime;
-
public HongBaoOrder() {
-
+
}
-
+
+ public HongBaoOrder(CommonOrder commonOrder, HongBaoV2 hongBao) {
+ this.commonOrder = commonOrder;
+ this.hongBaoV2 = hongBao;
+ }
+
public HongBaoOrder(Long id) {
this.id = id;
}
--
Gitblit v1.8.0