Merge branch 'master' into doc-import-driver

apache · Jun 18, 2024 · 5ae0533 · 5ae0533
2 parents 4be7e60 + fc6ea4a
commit 5ae0533
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/manager/src/main/resources/db/migration/mysql/V160__update_column.sql b/manager/src/main/resources/db/migration/mysql/V160__update_column.sql
@@ -30,3 +30,6 @@
 # UPDATE hzb_status_page_history SET unknowing = `unknown` WHERE `unknown` IS NOT NULL AND unknowing IS NULL;
 # ALTER TABLE hzb_status_page_history DROP COLUMN `unknown`;
 # commit;
+#
+# ALTER TABLE `hertzbeat`.`hzb_notice_rule` MODIFY COLUMN `receiver_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL AFTER `receiver_id`;
+# commit;
diff --git a/web-app/src/app/routes/setting/define/define.component.less b/web-app/src/app/routes/setting/define/define.component.less
@@ -0,0 +1,6 @@
+
+:host ::ng-deep {
+  .ant-menu-inline.ant-menu-root .ant-menu-item > .ant-menu-title-content, .ant-menu-inline.ant-menu-root .ant-menu-submenu-title > .ant-menu-title-content {
+    overflow: unset;
+  }
+}