 richjohnrambo
|
0a21d7289e
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# server/api/admin/imgroup/im_group.go
# server/api/admin/imuser/im_user.go
# server/internal/controller/admin/sys/im_group.go
# server/internal/controller/admin/sys/im_user.go
# server/internal/library/imtenant/db.go
# server/internal/logic/admin/member.go
# server/internal/logic/sys/im_admin_scope.go
# server/internal/logic/sys/im_group.go
# server/internal/logic/sys/im_invite.go
# server/internal/logic/sys/im_registration.go
# server/internal/logic/sys/im_tenant.go
# server/internal/logic/sys/im_user.go
# server/internal/model/input/sysin/im_group.go
# server/internal/model/input/sysin/im_invite.go
# server/internal/model/input/sysin/im_user.go
# server/internal/router/genrouter/im_invite.go
# server/internal/router/genrouter/im_registration.go
# server/internal/service/sys.go
# server/manifest/config/config.example.yaml
# server/storage/data/generate/im_audit_log_menu.sql
# server/storage/data/generate/im_group_menu.sql
# server/storage/data/generate/im_realname_menu.sql
# server/storage/data/generate/im_tenant_menu.sql
# server/storage/data/generate/im_user_menu.sql
# server/storage/data/generate/im_work_order_menu.sql
# server/storage/data/im_registration_invite_hotgo.sql
# web/src/api/imGroup/index.ts
# web/src/api/imUser/index.ts
# web/src/views/im/registrationInvite/BatchViewModal.vue
# web/src/views/im/registrationInvite/CreateModal.vue
# web/src/views/im/registrationInvite/index.vue
# web/src/views/im/registrationInvite/model.ts
# web/src/views/imGroup/governance.vue
# web/src/views/imGroup/members.vue
# web/src/views/imUser/index.vue
# web/src/views/imUser/model.ts
# web/src/views/imUser/view.vue
# web/src/views/system/config/ImRegistrationSetting.vue
|
2026-09-04 12:01:22 +08:00 |
|