From 587acdce2e2581b361b54c72cd572b9f0c9dc2cb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 30 Jan 2024 14:43:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E6=97=A5=E5=BF=97aop=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/components/ToolboxCfg.vue         | 2 +-
 de-xpack                                                        | 2 +-
 .../java/io/dataease/api/permissions/org/dto/OrgCreator.java    | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/layout/components/ToolboxCfg.vue b/core/core-frontend/src/layout/components/ToolboxCfg.vue
index 28fadec780..3ed1672fa4 100644
--- a/core/core-frontend/src/layout/components/ToolboxCfg.vue
+++ b/core/core-frontend/src/layout/components/ToolboxCfg.vue
@@ -44,7 +44,7 @@ onMounted(() => {
     popper-class="toolbox-top-popover"
     placement="bottom-end"
     width="208"
-    trigger="click"
+    trigger="hover"
   >
     <top-doc-card
       :span="12"
diff --git a/de-xpack b/de-xpack
index 4889ffa0fc..cf7956cd83 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 4889ffa0fcdfebe2755f5f1ce3b371e858abc981
+Subproject commit cf7956cd832cddfe23e7888b34075be3ffcb99da
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgCreator.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgCreator.java
index c53d772ac9..4eb01bd47b 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgCreator.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/dto/OrgCreator.java
@@ -12,6 +12,8 @@ public class OrgCreator implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -4246980891732805368L;
+
+    private Long id;
     @Schema(description = "组织名称")
     private String name;
     @Schema(description = "上级ID")