confict fixed by v117

b017f461 · 陈曦 · 11b97147 · d162604f · b017f461 · b017f461
Commit b017f461 authored Apr 24, 2026 by 陈曦
--- a/backend/ent/group/group.go
+++ b/backend/ent/group/group.go
--- a/backend/ent/group/where.go
+++ b/backend/ent/group/where.go
--- a/backend/ent/group_create.go
+++ b/backend/ent/group_create.go
--- a/backend/ent/group_update.go
+++ b/backend/ent/group_update.go
--- a/backend/ent/hook/hook.go
+++ b/backend/ent/hook/hook.go
--- a/backend/ent/identityadoptiondecision.go
+++ b/backend/ent/identityadoptiondecision.go
--- a/backend/ent/identityadoptiondecision/identityadoptiondecision.go
+++ b/backend/ent/identityadoptiondecision/identityadoptiondecision.go
--- a/backend/ent/identityadoptiondecision/where.go
+++ b/backend/ent/identityadoptiondecision/where.go
--- a/backend/ent/identityadoptiondecision_create.go
+++ b/backend/ent/identityadoptiondecision_create.go
--- a/backend/ent/identityadoptiondecision_delete.go
+++ b/backend/ent/identityadoptiondecision_delete.go
--- a/backend/ent/identityadoptiondecision_query.go
+++ b/backend/ent/identityadoptiondecision_query.go
--- a/backend/ent/identityadoptiondecision_update.go
+++ b/backend/ent/identityadoptiondecision_update.go
--- a/backend/ent/intercept/intercept.go
+++ b/backend/ent/intercept/intercept.go
--- a/backend/ent/migrate/auth_identity_fk_ondelete_test.go
+++ b/backend/ent/migrate/auth_identity_fk_ondelete_test.go
--- a/backend/ent/migrate/schema.go
+++ b/backend/ent/migrate/schema.go
--- a/backend/ent/mutation.go
+++ b/backend/ent/mutation.go
--- a/backend/ent/paymentorder.go
+++ b/backend/ent/paymentorder.go
--- a/backend/ent/paymentorder/paymentorder.go
+++ b/backend/ent/paymentorder/paymentorder.go
--- a/backend/ent/paymentorder/where.go
+++ b/backend/ent/paymentorder/where.go
--- a/backend/ent/paymentorder_create.go
+++ b/backend/ent/paymentorder_create.go