From 8e3544343391a8384c903f862fbb08159d9b378f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 30 Apr 2025 14:27:57 +0800
Subject: [PATCH] release: 2.6.2025043014

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

diff --git a/changelog.md b/changelog.md
index 191b2f20..0daaedaf 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,12 @@
+## 2.6.2025043014
+- feat: 新增功能
+  - 生产入库和领料支持b类合格品 [caoqianming]
+  - 添加标签模板接口 [caoqianming]
+  - 完善光子批次统计数据 [caoqianming]
+  - 组合件和入库检验追加统计分析 [caoqianming]
+  - get_alldata_with_batch添加内容 [caoqianming]
+- fix: 问题修复
+  - mio_saleout缺少import [caoqianming]
 ## 2.6.2025042816
 - feat: 新增功能
   - 支持个号转批号及配置 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index 0a53ee2d..dceec682 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.2025042816'
+SYS_VERSION = '2.6.2025043014'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition