From cdc30f5163eaf3671d51bc5f3d698c78ae520c66 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 9 Apr 2025 13:20:45 +0800
Subject: [PATCH] release: 2.6.2025040913

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

diff --git a/changelog.md b/changelog.md
index 16353e74..ff37f104 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,10 @@
+## 2.6.2025040913
+- feat: 新增功能
+  - 添加MyJSONEncoder以支持decimal [caoqianming]
+- fix: 问题修复
+  - 来料加工和完成筛选完善 [caoqianming]
+  - decimal存入json字段时使用myjsondecoder [caoqianming]
+  - cal_x_task_count分配任务数的bug [caoqianming]
 ## 2.6.2025040813
 - fix: 问题修复
   - ftest当is_ok和defect_main进行幂等 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index 4398a596..6d03b0ab 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.2025040813'
+SYS_VERSION = '2.6.2025040913'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition