From f228884b275da3777a95daf8bcda574f5cfbb1f9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 11 Apr 2025 13:33:48 +0800
Subject: [PATCH] release: 2.6.2025041113

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

diff --git a/changelog.md b/changelog.md
index ff37f104..faa5278b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+## 2.6.2025041113
+- feat: 新增功能
+  - ptest性能检验样品编号字段更改为text [caoqianming]
+- fix: 问题修复
+  - get_alldata_with_batch中小数计算异常捕获 [caoqianming]
+  - 光子综合查询对小数和None的处理 [caoqianming]
 ## 2.6.2025040913
 - feat: 新增功能
   - 添加MyJSONEncoder以支持decimal [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index 6d03b0ab..2ccaeeed 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.2025040913'
+SYS_VERSION = '2.6.2025041113'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition