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
+2 -2
View File
@@ -2807,7 +2807,7 @@ declare namespace API {
list: RedemptionRecord[];
};
type Subscribe = {
type SubscribeSimple = {
id: number;
name: string;
unit_price: number;
@@ -2830,7 +2830,7 @@ declare namespace API {
id: number;
subscribe_id: number;
user_group_id: number;
subscribe?: Subscribe;
subscribe?: SubscribeSimple;
user_group?: UserGroup;
created_at: number;
updated_at: number;