fix

2025-01-19 16:59:17 +08:00
parent ec73e51a2d
commit 12bda4ab8f
19 changed files with 561 additions and 354 deletions
--- a/src/components/Layout/Sidebar.jsx
+++ b/src/components/Layout/Sidebar.jsx
@@ -66,11 +66,7 @@ const Sidebar = ({ collapsed }) => {
      <Menu
        theme={isDarkMode ? "dark" : "light"}
        mode="inline"
-<<<<<<< HEAD
-        selectedKeys={getSelectedKeys}
-=======
        selectedKeys={[selectedKey]}
->>>>>>> 8dccf8e554eefcfa832eca45be35be4dddad3cb8
        defaultOpenKeys={defaultOpenKeys}
        items={menuClient}
        onClick={handleMenuClick}