From 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 13 Sep 2020 03:23:52 +0800
Subject: [PATCH] fix conflicts
---
src/main/java/com/xcong/excoin/modules/platform/service/PlatformBannerService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/platform/service/PlatformBannerService.java b/src/main/java/com/xcong/excoin/modules/platform/service/PlatformBannerService.java
index 370e0f7..51d6428 100644
--- a/src/main/java/com/xcong/excoin/modules/platform/service/PlatformBannerService.java
+++ b/src/main/java/com/xcong/excoin/modules/platform/service/PlatformBannerService.java
@@ -7,5 +7,5 @@
public interface PlatformBannerService extends IService<PlatformBannerEntity> {
public Result findAll();
-
+
}
--
Gitblit v1.9.1