mirror of
https://github.com/fastapi-practices/fastapi-best-architecture.git
synced 2026-10-01 00:05:20 +00:00
Merge branch 'master' into pre-tenant
# Conflicts: # backend/app/admin/service/auth_service.py # backend/common/security/jwt.py # backend/core/registrar.py # backend/middleware/access_middleware.py # backend/plugin/oauth2/api/v1/github.py # backend/plugin/oauth2/api/v1/google.py # backend/plugin/oauth2/crud/crud_user_social.py # backend/plugin/oauth2/service/user_social_service.py # backend/utils/dynamic_config.py
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
insert into sys_dept (id, name, sort, leader, phone, email, status, del_flag, parent_id, created_time, updated_time)
|
||||
values (2048601264366944256, '测试', 0, null, null, null, 1, false, null, now(), null);
|
||||
insert into sys_dept (id, name, sort, leader, phone, email, status, deleted, parent_id, created_time, updated_time)
|
||||
values (2048601264366944256, '测试', 0, null, null, null, 1, 0, null, now(), null);
|
||||
|
||||
insert into sys_menu (id, title, name, path, sort, icon, type, component, perms, status, display, cache, link, remark, parent_id, created_time, updated_time)
|
||||
values
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
insert into sys_dept (id, name, sort, leader, phone, email, status, del_flag, parent_id, created_time, updated_time)
|
||||
values (1, '测试', 0, null, null, null, 1, false, null, now(), null);
|
||||
insert into sys_dept (id, name, sort, leader, phone, email, status, deleted, parent_id, created_time, updated_time)
|
||||
values (1, '测试', 0, null, null, null, 1, 0, null, now(), null);
|
||||
|
||||
insert into sys_menu (id, title, name, path, sort, icon, type, component, perms, status, display, cache, link, remark, parent_id, created_time, updated_time)
|
||||
values
|
||||
|
||||
Reference in New Issue
Block a user