合并冲突

features/feature/src/main/ets/view/MainView.ets

@@ -1,3 +1,7 @@
+import { BackgroundPageModifier, DateOption, YTAddressSelectorDialog, YTDateUtil } from "basic"
+import { UnitType } from "basic/src/main/ets/datepicker/DatePickerEnums"
+import { promptAction } from "@kit.ArkUI"
+
 @Component
 export struct MainView {
   build() {
@@ -34,4 +38,15 @@ export struct MainView {
     .attributeModifier(new BackgroundPageModifier(true))
 
   }
+}
+@Builder
+function headerLeftBuilder(){
+  Image($r('app.media.app_icon'))
+    .width(24)
+}
+
+@Builder
+function headerRightBuilder(){
+  Image($r("app.media.app_icon"))
+    .width(24)
 }