From 948bbcb8059d455e83329cd8755cfb7c36502421 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 8 Apr 2025 13:38:31 +0800
Subject: [PATCH] release: 2.6.2025040813

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

diff --git a/changelog.md b/changelog.md
index e7a930cb..16353e74 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+## 2.6.2025040813
+- fix: 问题修复
+  - ftest当is_ok和defect_main进行幂等 [caoqianming]
+  - material_out_tracking获取时对None的情况进行处理 [caoqianming]
 ## 2.6.2025040710
 - feat: 新增功能
   - copy时matin matout不自动生成 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index ab608eb3..4398a596 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.2025040710'
+SYS_VERSION = '2.6.2025040813'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition