组件封装修改

2025-02-13 17:06:07 +08:00 · 2025-02-13 17:06:07 +08:00 · a03b6ccf7f
parent 006d754f83
commit a03b6ccf7f
1 changed files with 1 additions and 3 deletions
--- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts
+++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts
@ -54,15 +54,13 @@ const packagesListObj = {
    icon: renderIcon(AirPlaneOutlineIcon),
    label: PackagesCategoryName.DIY
  },
-<<<<<<< HEAD
  [PackagesCategoryEnum.UNITS]: {
    icon: renderIcon(AirPlaneOutlineIcon),
    label: PackagesCategoryName.UNITS
-=======
+  },
  [PackagesCategoryEnum.ZHIGAN]: {
    icon: renderIcon(AirPlaneOutlineIcon),
    label: PackagesCategoryName.ZHIGAN
->>>>>>> d5e71f44a955a99ff7e0d5112bad46d854b7c7ac
  }
 }