From 8a65359040b587944550a4ff6fc54188849661ec Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期五, 09 十一月 2018 18:00:15 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/common/JumpDetailV2Service.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/common/JumpDetailV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/common/JumpDetailV2Service.java
index 649898b..1e25278 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/common/JumpDetailV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/common/JumpDetailV2Service.java
@@ -38,4 +38,7 @@
 	 */
 	public JumpDetailV2 getByTypeCache(String type);
 
+	
+	public List<JumpDetailV2> listJump();
+
 }

--
Gitblit v1.8.0