From de5f231154a359481853b43064a5b263774d5a65 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 3 Apr 2025 16:35:14 +0800
Subject: [PATCH] release: 2.6.2025040316

---
 changelog.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/changelog.md b/changelog.md
index 19c631ee..67ab43e0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,10 @@
+## 2.6.2025040316
+- feat: 新增功能
+  - 通过指定mat_in/mat_out复制工艺路线 [caoqianming]
+  - 销售发货编号非必填 [caoqianming]
+- fix: 问题修复
+  - get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal [caoqianming]
+  - 组合件入库后未添加count的bug [caoqianming]
 ## 2.6.2025040211
 - feat: 新增功能
   - HTML_BASE_URL 前缀统一修改 [caoqianming]