From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 2e599a9..25c3e07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -101,6 +101,8 @@
 	public static final int SOURCE_TYPE_WPH = 4;
 	// 鏉ユ簮-鑻忓畞
 	public static final int SOURCE_TYPE_SUNING = 5;
+	// 鏉ユ簮-楗夸簡涔�
+	public static final int SOURCE_TYPE_ELME = 6;
 
 	// 鑷喘-杩斿埄
 	public static final int TYPE_REBATE = 1;
@@ -113,6 +115,12 @@
 	public static final int TOKEN_DAYS = 1;
 	// 璧犻�佹湁鏁堟湡-澶�
 	public static final int GIVE_DAYS = 1;
+	
+	
+	// 寰俊鑷姩鎻愮幇閲戦
+	public static final int AUTO_EXTRACT_MONEY = 1;
+	// 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
+	public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
 
 	public static WXGZConfig wxGZConfig;
 
@@ -248,6 +256,8 @@
 			return "鍞搧浼�";
 		case SOURCE_TYPE_SUNING:
 			return "鑻忓畞";
+		case SOURCE_TYPE_ELME:
+			return "楗夸簡涔�";
 		default:// 鍏朵粬绫诲瀷
 			return "";
 		}

--
Gitblit v1.8.0