merge: resolve conflicts with main branch

2026-10-13 20:46:38 +08:00 · 2026-03-03 14:19:18 +08:00
parent 1c10347357 5bd21e2ac1
commit be9d8773ce
50 changed files with 41353 additions and 1 deletions
@@ -0,0 +1,10 @@
+已完成：
+
+1. **提交**: `fix: apply custom IP binding to forward and tunnel chain services` (e383359)
+2. **PR**: [#247](https://github.com/Sagit-chu/flvx/pull/247) - 已合并
+3. **Tag**: `2.1.7-alpha7` 已创建并推送
+
+新功能：
+- 自定义 IP 绑定支持（节点、隧道、转发）
+- 转发列表紧凑模式与隧道组折叠/排序
+- 迁移测试增强