From fea68a736f124af075a8c4462efd80dcce1f3013 Mon Sep 17 00:00:00 2001 From: abearxiong Date: Sat, 24 Jan 2026 21:17:11 +0800 Subject: [PATCH] temp --- convex/_generated/api.d.ts | 10 ++-------- convex/schema.ts | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/convex/_generated/api.d.ts b/convex/_generated/api.d.ts index 436ad48..84c5f6a 100644 --- a/convex/_generated/api.d.ts +++ b/convex/_generated/api.d.ts @@ -9,13 +9,10 @@ */ import type * as abcv from "../abcv.js"; -<<<<<<< HEAD -import type * as xiong from "../xiong.js"; -======= import type * as actions_jwt from "../actions/jwt.js"; import type * as actions_redis from "../actions/redis.js"; import type * as http from "../http.js"; ->>>>>>> 5657bffd39687b05f44247a0318fee65990aa3db +import type * as xiong from "../xiong.js"; import type { ApiFromModules, @@ -25,13 +22,10 @@ import type { declare const fullApi: ApiFromModules<{ abcv: typeof abcv; -<<<<<<< HEAD - xiong: typeof xiong; -======= "actions/jwt": typeof actions_jwt; "actions/redis": typeof actions_redis; http: typeof http; ->>>>>>> 5657bffd39687b05f44247a0318fee65990aa3db + xiong: typeof xiong; }>; /** diff --git a/convex/schema.ts b/convex/schema.ts index dd9f1ae..c5e8879 100644 --- a/convex/schema.ts +++ b/convex/schema.ts @@ -8,6 +8,7 @@ export default defineSchema({ }), xiong: defineTable({ name: v.string(), + title: v.string(), }), users: defineTable({ id: v.string(), // 外部系统的用户 ID