From 42ba8948750f27331820ddc227d0d908f8c74fc9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 26 May 2025 15:35:19 +0800
Subject: [PATCH] release: 2.6.2025052615

---
 changelog.md       | 24 ++++++++++++++++++++++++
 server/settings.py |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 4270e0e1..5246307f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,27 @@
+## 2.6.2025052615
+- feat: 新增功能
+  - bachst添加复杂查询接口 [caoqianming]
+  - base 独立出ComplexQueryMixin [caoqianming]
+  - base with_children查询去除限制 [caoqianming]
+  - 处理dag时返回edge更多信息 [caoqianming]
+  - base 性能优化调整位置 [caoqianming]
+  - 所有batch设为textfield并添加索引 [caoqianming]
+  - mb添加batch查询条件 [caoqianming]
+  - ana batch时等待10s [caoqianming]
+  - batchst复用节点仅限mio创建的 [caoqianming]
+  - 各工段批次生产进度统计 [caoqianming]
+  - 导入棒管检验测试通过 [caoqianming]
+  - 修改导入权限 [caoqianming]
+  - enm 修改采集保存时间到秒 [zty]
+  - auth1 utils enm 修改阿里云发送短信引入方式 [zty]
+  - daoru棒管test [caoqianming]
+  - mlog和handover添加cbatch查询条件 [caoqianming]
+  - mloginit支持handle_users [caoqianming]
+- fix: 问题修复
+  - batchlog创建时避免回环 [caoqianming]
+  - batch_gxerp 优化 [caoqianming]
+  - 取消提交日志时时间校验 [caoqianming]
+  - is_fix支持个到个的bug [caoqianming]
 ## 2.6.2025051913
 - feat: 新增功能
   - batch_gxerp调整 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index 00481675..e5c80a11 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.2025051913'
+SYS_VERSION = '2.6.2025052615'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition