Merge branch 'longgexx/main'

15884f36 · shaw · 3d498413 · b03fb9c2 · 15884f36 · 15884f36
Commit 15884f36 authored Jan 10, 2026 by shaw
--- a/backend/ent/promocode_update.go
+++ b/backend/ent/promocode_update.go
--- a/backend/ent/promocodeusage.go
+++ b/backend/ent/promocodeusage.go
--- a/backend/ent/promocodeusage/promocodeusage.go
+++ b/backend/ent/promocodeusage/promocodeusage.go
--- a/backend/ent/promocodeusage/where.go
+++ b/backend/ent/promocodeusage/where.go
--- a/backend/ent/promocodeusage_create.go
+++ b/backend/ent/promocodeusage_create.go
--- a/backend/ent/promocodeusage_delete.go
+++ b/backend/ent/promocodeusage_delete.go
--- a/backend/ent/promocodeusage_query.go
+++ b/backend/ent/promocodeusage_query.go
--- a/backend/ent/promocodeusage_update.go
+++ b/backend/ent/promocodeusage_update.go
--- a/backend/ent/proxy_query.go
+++ b/backend/ent/proxy_query.go
--- a/backend/ent/redeemcode_query.go
+++ b/backend/ent/redeemcode_query.go
--- a/backend/ent/runtime/runtime.go
+++ b/backend/ent/runtime/runtime.go
--- a/backend/ent/schema/promo_code.go
+++ b/backend/ent/schema/promo_code.go
--- a/backend/ent/schema/promo_code_usage.go
+++ b/backend/ent/schema/promo_code_usage.go
--- a/backend/ent/schema/user.go
+++ b/backend/ent/schema/user.go
@@ -74,6 +74,7 @@ func (User) Edges() []ent.Edge {
 			Through("user_allowed_groups", UserAllowedGroup.Type),
 		edge.To("usage_logs", UsageLog.Type),
 		edge.To("attribute_values", UserAttributeValue.Type),
+		edge.To("promo_code_usages", PromoCodeUsage.Type),
 	}
 }


--- a/backend/ent/setting_query.go
+++ b/backend/ent/setting_query.go
--- a/backend/ent/tx.go
+++ b/backend/ent/tx.go
--- a/backend/ent/usagelog_query.go
+++ b/backend/ent/usagelog_query.go
--- a/backend/ent/user.go
+++ b/backend/ent/user.go
--- a/backend/ent/user/user.go
+++ b/backend/ent/user/user.go
--- a/backend/ent/user/where.go
+++ b/backend/ent/user/where.go