yeuimu a554b77379 fix(product-families): 热转印词表以 v2 为准——归因不再映射回烫画 ...

合并冲突的行为级裁决：develop 侧 memberMatrixCombos 曾把 热转印→烫画
归一（旧别名方案），与 v2 线上一等公民词表（8903afd）矛盾，导致 v2 侧
三个矩阵用例失败。取 v2 版 family-recompute.service.{ts,spec}（即当前
线上行为）。另修复 v2 分支 structs.md 残留的冲突标记。

Tests: api 23 suites/217 passed (runInBand), admin 27 passed, tsc clean

2026-09-03 02:00:33 +08:00

..

auth

fix(product-family): auto-merge SKUs after manual tag edits; fix session cookie path

2026-09-02 18:39:35 +08:00

categories

feat(deploy): production deployment setup and fixes

2026-08-26 14:23:09 +08:00

common

feat(deploy): production deployment setup and fixes

2026-08-26 14:23:09 +08:00

countries

feat(admin): country drag-sort + always-available member detail sync

2026-08-28 20:00:56 +08:00

goods

fix(goods): 商品展示名统一「品名 SKU」——剥 ASCII 型号限定词、纯款号补描述

2026-09-03 01:27:26 +08:00

origin-goods

fix(product-family): auto-merge SKUs after manual tag edits; fix session cookie path

2026-09-02 18:39:35 +08:00

positions

feat(deploy): production deployment setup and fixes

2026-08-26 14:23:09 +08:00

prisma

feat(deploy): production deployment setup and fixes

2026-08-26 14:23:09 +08:00

product-families

fix(product-families): 热转印词表以 v2 为准——归因不再映射回烫画

2026-09-03 02:00:33 +08:00

public

merge: refactor/v2 完全并入 develop（v2 为准，v2 血统 20+ 提交收敛为主干）

2026-09-03 01:54:32 +08:00

sync

fix(categories): 分类名去括号——同步入库整段删除括号段

2026-09-03 01:27:38 +08:00

tag-groups

fix(api,admin): stop test fixture junk leaking to shared dev DB; badge text x个配置

2026-08-30 03:15:18 +08:00

tags

feat(deploy): production deployment setup and fixes

2026-08-26 14:23:09 +08:00

upload

feat(deploy): production deployment setup and fixes

2026-08-26 14:23:09 +08:00

app.module.ts

feat(api): product families module with CRUD, auto-group, members, custom members and price overrides

2026-08-28 12:30:57 +08:00

main.ts

fix(api): drop helmet CSP upgrade-insecure-requests so Swagger UI loads over plain http

2026-08-28 17:50:39 +08:00