From 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 16:39:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/money/TeamEincomeRecord.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/money/TeamEincomeRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/money/TeamEincomeRecord.java
index 93b491b..c2e7966 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/money/TeamEincomeRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/money/TeamEincomeRecord.java
@@ -15,8 +15,8 @@
 public class TeamEincomeRecord {
 
 	public final static int TYPE_TEAM_REWARD = 1;// 鍥㈤槦濂栭噾
-	public final static int TYPE_TEAM_SUBSIDY = 2;// 鍥㈤槦琛ヨ创
-	public final static int TYPE_TEAM_DIVIDENTS = 3;// 鍥㈤槦鍒嗙孩
+	public final static int TYPE_TEAM_SUBSIDY = 2;// 鍥㈤槦琛ヨ创-浜岀骇澶栨瀬宸垎绾�
+	public final static int TYPE_TEAM_DIVIDENTS = 3;// 鍥㈤槦鍒嗙孩(鍥㈤槦濂栧姳)-鍥㈤槦濂栧姳=骞崇骇涓嶆柇浠e垎绾�
 
 	public final static int STATE_RECIEVED = 2;// 宸茬粡棰嗗彇
 	public final static int STATE_NOT_RECIEVE = 1;// 鏈鍙�

--
Gitblit v1.8.0