From bf5c02aaecb3f7a42daa4fa356c62a2e6bca0db5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:55:59 +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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 825761e..055b08a 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
@@ -27,14 +27,16 @@
public enum UserMoneyDetailTypeEnum {
share("鍒嗕韩濂栭噾", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""), invite("閭�璇峰閲�", "http://img.flqapp.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("濂栭噾鏀跺叆", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""), fanli("杩斿埄鍒拌处", "http://img.flqapp.com/resource/money_detail/icon_fanli.png",
- ""), fanliWeiQuan("杩斿埄鎵ｉ櫎", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), inviteWeiQuan("閭�璇峰閲戞墸闄�", "http://img.flqapp.com/resource/money_detail/icon_invite.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎", "http://img.flqapp.com/resource/money_detail/icon_share.png",
- "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",
+ ""), fanliWeiQuan("杩斿埄鎵ｉ櫎", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"), inviteWeiQuan("閭�璇峰閲戞墸闄�", "http://img.flqapp.com/resource/money_detail/icon_invite.png", "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"), shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎", "http://img.flqapp.com/resource/money_detail/icon_share.png",
+ "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"), weiQuan("鍞悗璁㈠崟鎵ｆ", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"), 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",""),repeatStatistic("閲嶅缁熻杩斿埄/濂栭噾鎵ｉ櫎","http://img.flqapp.com/resource/money_detail/icon_fanli.png",""),
elmeFanli("楗夸簡涔堣繑鍒╁埌璐�","http://img.flqapp.com/resource/money_detail/icon_fanli.png",""),
redPackExchange("绾㈠寘鎻愮幇鍒颁綑棰�", "http://img.flqapp.com/resource/money_detail/icon_score.png",""),
- extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractAutoWXRefund("鑷姩鎻愮幇澶辫触", "http://img.flqapp.com/resource/money_detail/icon_extract.png", "");
+ extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
+ extractAutoWXRefund("鑷姩鎻愮幇澶辫触", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
+ subsidy("棰濆琛ヨ创","","");
private final String desc;
@@ -97,6 +99,17 @@
private Date updateTime;
private Integer state;//鑰佺増鏄庣粏閫傜敤璇ュ瓧娈�
+
+ @Column(name = "umd_show")
+ private Boolean show;//鏄惁鏄剧ず
+
+ public Boolean getShow() {
+ return show;
+ }
+
+ public void setShow(Boolean show) {
+ this.show = show;
+ }
public Integer getState() {
return state;
--
Gitblit v1.8.0