From 50bf3e78d4104bf8688573e271caa3928f62a92e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 20 Jun 2025 15:20:49 +0800
Subject: [PATCH] release: 2.6.2025062015

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

diff --git a/changelog.md b/changelog.md
index cba9228c..060455f4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,14 @@
+## 2.6.2025062015
+- feat: 新增功能
+  - 增加交接撤回功能 [caoqianming]
+  - mlogbin的bug [caoqianming]
+  - mioitem返回mio数据添加单价字段 [caoqianming]
+  - 物料增加主库位号 [caoqianming]
+  - wmaterial添加can_handover字段 [caoqianming]
+- fix: 问题修复
+  - wpr不合格的话先save再创建wm.defect [caoqianming]
+  - wpm/service 优化煤粉热值获取方式 [zty]
+  - mioitem price 计算bug [caoqianming]
 ## 2.6.2025061715
 - feat: 新增功能
   - mlogbin的编辑与mlogbout的联动 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index d28aed0b..f45999bb 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.2025061715'
+SYS_VERSION = '2.6.2025062015'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition