From eed54c262df12dd3d132bf14691915e6183afd4c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 一月 2020 17:23:11 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 5dfb3e2..972d909 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -488,8 +488,5 @@
 			}
 		} catch (Exception e) {
 		}
-	}
-	
-	
-	
+	}
 }

--
Gitblit v1.8.0