From 41ca6e0132b92a34624380a18d19eb7b7e73d522 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:23:51 +0800
Subject: [PATCH] 冲突

---
 fanli/src/test/java/org/fanli/tlj/Test_IntegralTaskRecordService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/tlj/Test_IntegralTaskRecordService.java b/fanli/src/test/java/org/fanli/tlj/Test_IntegralTaskRecordService.java
index f8fab5d..fc617c6 100644
--- a/fanli/src/test/java/org/fanli/tlj/Test_IntegralTaskRecordService.java
+++ b/fanli/src/test/java/org/fanli/tlj/Test_IntegralTaskRecordService.java
@@ -50,5 +50,7 @@
 	
 	
 	
+	
+	
 
 }

--
Gitblit v1.8.0