Merge authoritative main into the task branch
Why: resolve gitlink conflict after parallel merges; frontend already contains main's changes. Evidence: frontend at aaced87 (includes main 2c56054). Impact: integration merge. Refs: Dev #368
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
@@ -30,7 +30,7 @@ U2 起实施与部署分别评审。
|
||||
|
||||
- [RDM 模板与两树一网对话文档生成方案 r1.1](modules/documents/docs/proposals/2026-10-11-rdm-template-dialog-generation.md):69 类历史资产盘点、模板版本与章节实例化、持久提案、文档级审签及 DOCX;待用户评审,业务实施与运行验收 NOT_RUN。 首批项目建议书/竞品分析、随后扩展全部文档已确认(2026-10-11),其余方案与实施仍待评审。
|
||||
|
||||
- [RDM 最终目标核对与完整交付方案 r1](modules/documents/docs/proposals/2026-10-11-rdm-final-target-completion.md):系统级项目、上限内权限覆盖、私域协作、全部文档三权与完整业务链;34 UR/68 SR/10 F 逐条映射,目标口径已确认,总体方案待评审。
|
||||
- [RDM 最终目标核对与完整交付方案 r1](modules/documents/docs/proposals/2026-10-11-rdm-final-target-completion.md):系统级项目、上限内权限覆盖、私域协作、全部文档三权与完整业务链;34 UR/68 SR/10 F 逐条映射;方案已随 #340 合入(2026-10-11),U1 需求基线核对经 RDM #199/#200 落地,U2 起未启动。
|
||||
|
||||
## 验证
|
||||
|
||||
|
||||
+1
-1
Submodule modules/backend updated: 9f7b3c5405...eb12f102f2
+1
-1
Submodule modules/documents updated: 72a098a783...75ddd65c69
+1
-1
Submodule modules/ui updated: 6f68a9579d...f2331b02d6
Reference in New Issue
Block a user