From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SwiperPictureService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SwiperPictureService.java
index f010b9b..9b9f560 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SwiperPictureService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SwiperPictureService.java
@@ -95,4 +95,5 @@
 	 * @throws SwiperPictureException
 	 */
 	public List<SwiperPicture> getByBannerId(Long bannerId) throws SwiperPictureException;
+
 }

--
Gitblit v1.8.0