zzhyyyyy
b982156906
Merge origin/main into feat/feedback-qr-and-admin-ops
解决冲突(均为两边各自新增、按并集保留):
- ad_feed_reward 模型/schema/repo/api:本侧 feed_scene 点位场景 + main 侧 app_env/our_code_id/aborted 全部保留;
feed_scene 一并补进 main 新增的 closed_early / too_short 分支,保证全路径落库。
- core/media.py:保留本侧泛化 _delete_managed(subdir) + 并入 main 的 save_cps_image / to_abs_media_url,
去掉 main 重复的旧 delete_avatar(本侧已有薄封装)。
- admin/schemas/user.py:本侧 UserRewardStats / UserCoinRecord 与 main 的 _strip_reason 并存。
- admin/routers/withdraw.py:列表接口用 3 元组(带 total)解包 + 保留本侧手机号/昵称/累计富化,total 一并返回。
- alembic:新增 merge 迁移 ceb286289426 合并 add_feed_scene 与 launch_confirm_sample_table 双 head。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 23:53:54 +08:00
..
2026-05-23 17:37:18 +08:00
2026-06-08 05:54:55 +08:00
2026-06-02 09:53:25 +08:00
2026-06-10 22:49:33 +08:00
2026-06-08 00:16:25 +08:00
2026-06-06 00:42:39 +08:00
2026-06-16 01:39:05 +08:00
2026-06-10 02:28:56 +08:00
2026-06-01 22:23:15 +08:00
2026-06-09 01:56:47 +08:00
2026-06-15 23:13:14 +08:00
2026-05-27 21:04:03 +08:00
2026-06-20 23:34:28 +08:00
2026-06-04 03:02:41 +08:00
2026-06-06 04:13:08 +08:00
2026-06-17 10:00:29 +08:00
2026-06-06 00:42:39 +08:00
2026-05-27 21:04:03 +08:00
2026-06-20 23:53:54 +08:00
2026-06-07 23:17:27 +08:00
2026-06-09 01:56:47 +08:00
2026-06-13 03:53:43 +08:00
2026-06-17 22:33:33 +08:00
2026-06-01 22:23:15 +08:00
2026-06-01 22:23:15 +08:00
2026-06-01 22:23:15 +08:00
2026-06-10 22:26:51 +08:00
2026-06-10 16:07:33 +08:00
2026-06-14 23:41:54 +08:00
2026-06-08 03:20:51 +08:00
2026-06-17 21:32:10 +08:00
2026-06-17 10:00:29 +08:00
2026-06-17 10:00:29 +08:00
2026-06-17 19:21:20 +08:00
2026-06-19 11:44:11 +08:00
2026-06-10 22:26:51 +08:00
2026-06-15 23:13:14 +08:00
2026-06-12 00:51:47 +08:00
2026-06-06 04:13:08 +08:00
2026-05-29 15:20:22 +08:00
2026-06-10 15:43:54 +08:00
2026-05-30 18:13:11 +08:00
2026-05-28 22:27:36 +08:00
2026-05-27 21:04:03 +08:00
2026-06-08 04:57:55 +08:00
2026-06-09 21:48:48 +08:00
2026-06-20 13:39:45 +08:00
2026-06-07 23:17:27 +08:00
2026-06-07 23:17:27 +08:00
2026-06-08 00:16:25 +08:00
2026-06-09 18:10:58 +08:00
2026-06-10 18:32:51 +08:00
2026-06-07 23:17:27 +08:00
2026-06-07 23:17:27 +08:00
2026-06-07 23:17:27 +08:00
2026-06-07 23:17:27 +08:00
2026-06-07 03:31:35 +08:00
2026-05-27 21:04:03 +08:00
2026-06-01 21:29:52 +08:00
2026-05-27 21:04:03 +08:00
2026-06-14 01:24:29 +08:00
2026-06-16 01:25:57 +08:00
2026-06-14 01:24:29 +08:00
2026-06-14 01:24:29 +08:00
2026-06-15 18:07:32 +08:00
2026-05-27 21:04:03 +08:00
2026-06-10 22:27:06 +08:00
2026-05-27 21:04:03 +08:00
2026-06-06 18:52:42 +08:00
2026-05-27 21:04:03 +08:00
2026-05-27 21:04:03 +08:00
2026-06-06 04:51:50 +08:00
2026-06-09 01:56:37 +08:00