merge: 同步 upstream/main 新功能到定制版本

- feat: Add slider verification code (bd67997)
- fix bug: Inventory cannot be zero (1f7a6ee)
- fix: resolve merge conflicts and lint errors
This commit is contained in:
2026-03-23 21:50:10 -07:00
parent 3806264343
commit d6616c5859
63 changed files with 3111 additions and 1130 deletions
@@ -81,7 +81,9 @@ export default function ResetSubscribeLogPage() {
page: pagination.page,
size: pagination.size,
date: (filter as any)?.date,
user_subscribe_id: (filter as any)?.user_subscribe_id ? Number((filter as any)?.user_subscribe_id) : undefined,
user_subscribe_id: (filter as any)?.user_subscribe_id
? Number((filter as any)?.user_subscribe_id)
: undefined,
});
const list = (data?.data?.list || []) as any[];
const total = Number(data?.data?.total || list.length);