From 016ef5351725ae1204659deefe38bc44b5b2a398 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 9 Jun 2025 13:33:13 +0800
Subject: [PATCH] release: 2.6.2025060913

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

diff --git a/changelog.md b/changelog.md
index f5ac508e..957ab8a8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,8 @@
+## 2.6.2025060913
+- feat: 新增功能
+  - inm 和 wpm添加wpr number的查询条件 [caoqianming]
+  - 优化设备采集cd [caoqianming]
+  - mlogb cal_count_pn_jgqbl [caoqianming]
 ## 2.6.2025060617
 - feat: 新增功能
   - mlogbw也进行mlogb.cal_count_notok() [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index fdab6542..2678e14a 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.2025060617'
+SYS_VERSION = '2.6.2025060913'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition