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:
Wu Clan
2026-05-31 16:20:49 +08:00
92 changed files with 3608 additions and 2784 deletions
@@ -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
+2 -2
View File
@@ -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