合并代码

src/components/index.ts

@@ -9,6 +9,7 @@ import TimeSelector from './TimeSelector'
 import TitleTextarea from './TitleTextarea'
 import CommonPopup from './CommonPopup'
 import DateTimePicker from './DateTimePicker/DateTimePicker'
+<<<<<<< HEAD
 import TimePicker from './TimePicker/TimePicker'
 import CalendarCard, { DialogCalendarCard } from './CalendarCard'
 import CommonDialog from './CommonDialog'
@@ -31,4 +32,21 @@ import PublishMenu from './PublishMenu/PublishMenu'
     CommonDialog,
     PublishMenu
  }
+=======
+import UploadCover from './UploadCover'
+
+export {
+    ActivityTypeSwitch,
+    TextareaTag,
+    FormSwitch,
+    ImageUpload,
+    Range,
+    NumberInterval,
+    TimeSelector,
+    TitleTextarea,
+    CommonPopup,
+    DateTimePicker,
+    UploadCover,
+}
+>>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034