diff --git a/changelog.md b/changelog.md
index faa5278b..2862038b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,41 @@
+## 2.6.2025041613
+- feat: 新增功能
+  - 添加count_json_from字段及相应逻辑 [caoqianming]
+  - 车间库存按任务筛选时count>0 [caoqianming]
+  - 工艺步骤增加排序字段 [caoqianming]
+  - 物料筛选low_inm进行优化 [caoqianming]
+  - 变更order状态 [caoqianming]
+  - 扣减库存不足增加提示 [caoqianming]
+  - update_inm关于销售发货/其他出库的bug2 [caoqianming]
+  - update_inm关于销售发货/其他出库的bug [caoqianming]
+  - fmlog添加is_fix字段校验 [caoqianming]
+  - fmlog添加is_fix字段 [caoqianming]
+  - 单个日志填写时带入wm_in的batch [caoqianming]
+  - 添加ichat以支持AI对话 [caoqianming]
+  - ptest性能检验样品编号字段更改为text [caoqianming]
+  - 添加MyJSONEncoder以支持decimal [caoqianming]
+  - copy时matin matout不自动生成 [caoqianming]
+  - 通过指定mat_in/mat_out复制工艺路线 [caoqianming]
+  - 销售发货编号非必填 [caoqianming]
+- fix: 问题修复
+  - 交接分批bug/加工前不良的bug [caoqianming]
+  - mio_saleout时正确计算delivered_count [caoqianming]
+  - 返修交接后物料状态都变为返修品 [caoqianming]
+  - handover拆批请选择车间库存2 [caoqianming]
+  - handover拆批请选择车间库存 [caoqianming]
+  - get_alldata_with_batch中小数计算异常捕获 [caoqianming]
+  - 光子综合查询对小数和None的处理 [caoqianming]
+  - 来料加工和完成筛选完善 [caoqianming]
+  - decimal存入json字段时使用myjsondecoder [caoqianming]
+  - cal_x_task_count分配任务数的bug [caoqianming]
+  - ftest当is_ok为True时设置defect为空 [caoqianming]
+  - ftest当is_ok为false时才设置defect_main [caoqianming]
+  - material_out_tracking获取时对None的情况进行处理 [caoqianming]
+  - get_dag时matin matout为空时不报错 [caoqianming]
+  - 通过指定mat_in/mat_out复制工艺路线 bug2 [caoqianming]
+  - 通过指定mat_in/mat_out复制工艺路线 bug1 [caoqianming]
+  - get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal [caoqianming]
+  - 组合件入库后未添加count的bug [caoqianming]
 ## 2.6.2025041113
 - feat: 新增功能
   - ptest性能检验样品编号字段更改为text [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index 2ccaeeed..b4558da6 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.2025041113'
+SYS_VERSION = '2.6.2025041613'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition