Fix merge errors

This commit is contained in:
Wu Clan
2026-07-01 00:07:34 +08:00
parent 70159d4615
commit df045ac9f0
4 changed files with 24 additions and 5 deletions
@@ -7,7 +7,7 @@ values
(2049629108257816578, '修改', 'EditNotice', null, 0, null, 2, null, 'sys:notice:edit', 1, 0, 1, '', null, 2049629108257816576, now(), null),
(2049629108257816579, '删除', 'DeleteNotice', null, 0, null, 2, null, 'sys:notice:del', 1, 0, 1, '', null, 2049629108257816576, now(), null);
insert into sys_notice (id, title, type, status, content, created_time, updated_time)
insert into sys_notice (id, title, type, status, content, created_time, updated_time, tenant_id)
values (2112248797756129280, 'hahahahahaahahaha', 0, 1, '你好😄
```
@@ -7,7 +7,7 @@ values
(2049629108257816578, '修改', 'EditNotice', null, 0, null, 2, null, 'sys:notice:edit', 1, 0, 1, '', null, 2049629108257816576, now(), null),
(2049629108257816579, '删除', 'DeleteNotice', null, 0, null, 2, null, 'sys:notice:del', 1, 0, 1, '', null, 2049629108257816576, now(), null);
insert into sys_notice (id, title, type, status, content, created_time, updated_time)
insert into sys_notice (id, title, type, status, content, created_time, updated_time, tenant_id)
values (2112248797756129280, 'hahahahahaahahaha', 0, 1, '你好😄
```