fixed conflict

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/notice/IMoGoNoticeProvider.java

@@ -1,5 +1,6 @@
 package com.mogo.eagle.core.function.api.notice;
 
+import com.mogo.eagle.core.data.notice.NoticeNormalData;
 import com.mogo.eagle.core.data.notice.NoticePushData;
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
 
@@ -16,4 +17,12 @@ public interface IMoGoNoticeProvider extends IMoGoFunctionProvider {
      * @param pushData 推送消息体
      */
     void showNoticeForTrafficWithData(NoticePushData pushData);
+
+    /**
+     * 呈现普通公告顶部弹框
+     *
+     * @param normalData 推送消息体
+     */
+    void showNoticeNormalData(NoticeNormalData normalData);
+
 }