From 5b9d2618adf1b2267b2623e940f331e19d77d66e Mon Sep 17 00:00:00 2001
From: zhi <zhi@dev.hangman-lab.top>
Date: Tue, 31 Mar 2026 01:18:01 +0000
Subject: [PATCH] BE-CAL-006: mark overlap detection task complete in TASKLIST

---
 HarborForge.Backend | 2 +-
 plans/TASKLIST.md   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HarborForge.Backend b/HarborForge.Backend
index a5b885e..570cfee 160000
--- a/HarborForge.Backend
+++ b/HarborForge.Backend
@@ -1 +1 @@
-Subproject commit a5b885e8b54b42f2c60067aa04a9ce3df1fbccee
+Subproject commit 570cfee5cdf6df71af279c46f135d7e1991f5fb4
diff --git a/plans/TASKLIST.md b/plans/TASKLIST.md
index bf93242..d8729d5 100644
--- a/plans/TASKLIST.md
+++ b/plans/TASKLIST.md
@@ -122,10 +122,10 @@
   - [x] 实现虚拟 slot 转真实 slot 的物化逻辑
   - [x] 实现 edit / cancel 后断开 plan 关联
 
-- [ ] BE-CAL-006:实现 Calendar overlap 校验(backend only)
-  - [ ] 校验同日时间冲突
-  - [ ] 返回明确的冲突错误信息
-  - [ ] 区分 create 与 edit 两种场景
+- [x] BE-CAL-006:实现 Calendar overlap 校验(backend only)
+  - [x] 校验同日时间冲突
+  - [x] 返回明确的冲突错误信息
+  - [x] 区分 create 与 edit 两种场景
 
 - [ ] BE-CAL-007:实现 MinimumWorkload warning 规则(backend only)
   - [ ] 计算 daily / weekly / monthly / yearly 工作量