From fffb4a8328b5a383653e31160e0fd8597a667e00 Mon Sep 17 00:00:00 2001
From: HeroOfJava <1654401127@qq.com>
Date: Sat, 7 Apr 2018 21:18:39 +0800
Subject: [PATCH 1/2] Delete a.txt

---
 a.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 a.txt

diff --git a/a.txt b/a.txt
deleted file mode 100644
index 6889536..0000000
--- a/a.txt
+++ /dev/null
@@ -1 +0,0 @@
-a master

From 3c7f9df7ec28b292e4e5d7d5994e2a83af45c02b Mon Sep 17 00:00:00 2001
From: wudi <wudi@xiaohongchun.com>
Date: Sat, 7 Apr 2018 21:24:19 +0800
Subject: [PATCH 2/2] delete

---
 a.txt | 55 -------------------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 a.txt

diff --git a/a.txt b/a.txt
deleted file mode 100644
index 34a570d..0000000
--- a/a.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-
-master
-
-
- if(check(三要素))  //不一致失败
->>>>>>> 4058c2decdc7cb5849956961d5daa64ed9279aea
-{
-	exit(直接拒绝)	
-}
-
-if(check(机构K手机在网时长)) //小于6个月失败
-{
-	exit(直接拒绝)
-}
-
-if(check(机构K手机状态）)  //不在网失败
-{
-	exit(直接拒绝)
-}
-
-if (check(机构R黑名单))  //黑名单命中拒绝
-{	
-	exit(直接拒绝)
-}
-
-switch(check(融360信用报告得分)）
-{
-	case (>=600):
-	{
-
-	}
-	case (>=450 && < 600):
-	{
-		if (check(芝麻信用分) <= 650）  //芝麻分接入进度待定
-		{
-			exit(直接拒绝)
-		}
-
-		if (check(小红唇平台消费记录))  //消费金额<500
-		{
-			exit(直接拒绝)
-		}
-
-		if (!check(活体识别))  //未通过
-		{
-			exit(直接拒绝)
-		}
-	}
-	case (<=450):
-	{
-		exit(直接拒绝)
-	}
-}
-
-[{"xhc": {"rangeLow": 450, "rangeHigh": 10000, "ruleResult": 0}, "zhima": {"rangeLow": 450, "rangeHigh": 10000, "ruleResult": 0}, "rangeLow": 450, "rangeHigh": 10000, "ruleResult": 0}]