diff --git a/changelog.md b/changelog.md
index c4891ca4..f5ac508e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,20 @@
+## 2.6.2025060617
+- feat: 新增功能
+  - mlogbw也进行mlogb.cal_count_notok() [caoqianming]
+  - 优化batches_to [caoqianming]
+  - cal_count_notok 完全合格数有bug [caoqianming]
+  - batch_gxerp 全工段查询 [caoqianming]
+  - cd BrokenPipeError时尝试再建立连接 [caoqianming]
+  - 获取到重复的缺陷项 打日志 [caoqianming]
+  - can_fix 排除维修完成品 [caoqianming]
+  - batchst 添加first_time isnull筛选 [caoqianming]
+  - 获取first_time, last_time独立出一个方法 [caoqianming]
+- fix: 问题修复
+  - mlog 的cal_count_notok_full的bug [caoqianming]
+  - 光芯批次统计"尺寸检验_完全合格率" [caoqianming]
+  - handover_submit batches获取bug [caoqianming]
+  - update_mb_item在检验时只做负数校验 [caoqianming]
+  - handover_submit batches获取bug [caoqianming]
 ## 2.6.2025060409
 - feat: 新增功能
   - 修改gen_number_with_rule 以获取的最后编号为准 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index 008c65c0..fdab6542 100755
--- a/server/settings.py
+++ b/server/settings.py
@@ -35,7 +35,7 @@ sys.path.insert(0, os.path.join(BASE_DIR, 'apps'))
 ALLOWED_HOSTS = ['*']
 
 SYS_NAME = '星途工厂综合管理系统'
-SYS_VERSION = '2.6.2025060409'
+SYS_VERSION = '2.6.2025060617'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition