fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/platform/service/PlatformBannerService.java

@@ -7,5 +7,5 @@
public interface PlatformBannerService extends IService<PlatformBannerEntity> {



   public Result findAll();

	


}