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/bus/msg/MsgOrderDetail.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
index b0bdbf2..8f569a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
@@ -22,7 +22,7 @@
public final static int STATE_SX = 4;// 鏈粯娆�/宸查��娆�
public enum MsgTypeOrderTypeEnum {
- fanli("杩斿埄璁㈠崟"), share("鍒嗕韩璁㈠崟"), invite("閭�璇疯鍗�");
+ fanli("杩斿埄璁㈠崟"), share("鍒嗕韩璁㈠崟"), invite("閭�璇疯鍗�"), found("璁㈠崟鎵惧洖");
private final String desc;
private MsgTypeOrderTypeEnum(String desc) {
@@ -50,6 +50,8 @@
private BigDecimal payMoney;// 浠樻閲戦
@Column(name = "mo_hongbao_money")
private BigDecimal hongBaoMoney;// 浣ｉ噾
+ @Column(name = "mo_happen_date")
+ private Date happendDate;// 鍙戠敓鏃堕棿
@Column(name = "mo_beizhu")
private String beiZhu;
@Column(name = "mo_read")
@@ -155,4 +157,12 @@
this.updateTime = updateTime;
}
+ public Date getHappendDate() {
+ return happendDate;
+ }
+
+ public void setHappendDate(Date happendDate) {
+ this.happendDate = happendDate;
+ }
+
}
--
Gitblit v1.8.0