From 391f2e33973b93b0aee53ca93affb1c92eb9a9d7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 10 一月 2019 09:03:48 +0800
Subject: [PATCH] Merge branch 'master' into div1

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
index 9ec7167..eed7f9e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
@@ -225,6 +225,8 @@
 		typeList.clear();
 		typeList.add(UserMoneyDetailTypeEnum.invite);
 		typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
+		typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+		
 		minDate = new Date(0L);
 		maxDate = new Date(timeStamp);
 		vo.setTotalInviteMoney(

--
Gitblit v1.8.0