From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
index 80cc7f9..e998a1e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
@@ -31,7 +31,7 @@
"http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), weiQuan("鍞悗璁㈠崟鎵ｆ", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), systemEqualize("绯荤粺琛ラ綈", "http://img.flqapp.com/resource/money_detail/icon_system.png", ""), scoreConvert("绉垎鍏戞崲", "http://img.flqapp.com/resource/money_detail/icon_score.png",
""), hongbao("瀹樻柟绾㈠寘", "http://img.flqapp.com/resource/money_detail/icon_hongbao.png", ""), hongbaoDeduct("绾㈠寘閫�娆�", "http://img.flqapp.com/resource/money_detail/icon_hongbao.png",
""), buyScore("璐拱绉垎", "http://img.flqapp.com/resource/money_detail/icon_score.png", ""), extract("鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png",
- ""), extractVerify("鎻愮幇楠岃瘉", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractReject("鎻愮幇琚嫆", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),orderReward("杩斿埄濂栧姳","http://img.flqapp.com/resource/money_detail/icon_order_reward.png","");
+ ""), extractVerify("鎻愮幇楠岃瘉", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractReject("鎻愮幇琚嫆", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),orderReward("杩斿埄濂栧姳","http://img.flqapp.com/resource/money_detail/icon_order_reward.png",""),repeatStatistic("閲嶅缁熻杩斿埄/濂栭噾鎵ｉ櫎","http://img.flqapp.com/resource/money_detail/icon_fanli.png","");
private final String desc;
private final String picture;
private final String helpUrl;
@@ -66,6 +66,10 @@
@Expose
@Column(name = "umd_type")
private UserMoneyDetailTypeEnum type;
+
+ @Column(name = "umd_order_type")
+ private Integer orderType;//鍜岃鍗曠浉鍏虫暟鎹墠澶勭悊
+
@Expose
@Column(name = "umd_title")
private String title;// 鏍囬
@@ -192,6 +196,15 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
}
--
Gitblit v1.8.0