From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinDetail.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinDetail.java
index c2207c1..7afdf35 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinDetail.java
@@ -21,7 +21,9 @@
add("绾㈠寘澧炲姞", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
reduce("鎴愬姛浣跨敤鎵ｉ櫎", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
sendBack("闀挎湡鏈娇鐢ㄦ敹鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- refund("鏈娇鐢ㄦ垚鍔熼��鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png");
+ refund("鏈娇鐢ㄦ垚鍔熼��鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ give("绾㈠寘璧犻��", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ giveBack("璧犻�侀��鍥� ", "http://img.flqapp.com/img/tlj/icon_tlj.png");
private final String desc;
private final String picture;
--
Gitblit v1.8.0