diff --git a/changelog.md b/changelog.md
index 536b772e..00e7c0f9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,148 @@
+## 3.0.2025122514
+- feat: 新增功能
+  - mlogbw patch权限 [caoqianming]
+  - 固定资产入库流程apply [caoqianming]
+  - resignation ticket存入employee_name [caoqianming]
+  - 新增人员交接单及其修改 人员交接时候反存校验 [TianyangZhang]
+  - asm assetlogcreate [caoqianming]
+  - base 提交时可变动工单title [caoqianming]
+  - 车间库存支持传入count_all [caoqianming]
+  - wmaterial search时去除material__number [caoqianming]
+  - base ticketmixin 修改 ”perform_update“ bug [TianyangZhang]
+  - wmaterial添加mlog_date_start筛选条件 [caoqianming]
+  - 新增hrm --人员交接表 [TianyangZhang]
+  - asm初步接口 [caoqianming]
+  - base userfilter获取归属于该部门及以下部门的人 [caoqianming]
+  - 玻纤添加mioitemw检验导入表 [caoqianming]
+  - 修改mioitemw test的导入逻辑 [caoqianming]
+  - 光子六车间批次生产合格率修改 [caoqianming]
+  - 取消handover_submit无用校验 [caoqianming]
+  - 合批时校验批次是否已存在 [caoqianming]
+  - routepack删除时做一下校验 [caoqianming]
+  - 维修记录初步完成 [caoqianming]
+  - base ticketmixin传入other_data [caoqianming]
+  - base 模板字段改为textfield [caoqianming]
+  - 删除asm同步文件 [caoqianming]
+  - 修改hrm/urls --EMPneed [TianyangZhang]
+  - 新增模块固定资产 asm [TianyangZhang]
+  - 添加员工需求表 [caoqianming]
+  - route接口增加按product获取总图 [caoqianming]
+  - base wf增加ticket_count接口添加分类 [caoqianming]
+  - validate_dag检查检查未到达的物料 [caoqianming]
+  - 自动生成物料的逻辑优化 [caoqianming]
+  - cal_x_task_count默认使用target_quantity [caoqianming]
+  - base wf 捕获expr is None的错误 [caoqianming]
+  - validate_dag增加传入参数 [caoqianming]
+  - 改版交接支持拆合批 [caoqianming]
+  - translate_eval_formula 打印报错信息 [caoqianming]
+  - base 优化safe_get_or_create [caoqianming]
+  - base 增加statedetailserializer可返回节点操作人员 [caoqianming]
+  - 获取batchlog dag数据支持临近节点返回 [caoqianming]
+  - base ticket create支持transition非必传 [caoqianming]
+  - 供应商审核通过后即可添加供应商 [caoqianming]
+  - 校验SupplierAudit供应商名称已存在 [caoqianming]
+  - material list filter low_inm优化 [caoqianming]
+  - material list 如需获取库存数据需指定传参 [caoqianming]
+  - 添加部分索引 [caoqianming]
+  - base ticket create支持transition非必传 [caoqianming]
+  - 供应商审核通过后即可添加供应商 [caoqianming]
+  - 校验SupplierAudit供应商名称已存在 [caoqianming]
+  - material list filter low_inm优化 [caoqianming]
+  - material list 如需获取库存数据需指定传参 [caoqianming]
+  - 添加部分索引 [caoqianming]
+  - srm -model-Papersecret 增加 organization 申请部门字段 [TianyangZhang]
+  - 优化mlogbw list接口速度 [caoqianming]
+  - srm-patent修改字段类型 [TianyangZhang]
+  - resignation添加ticketrelate_name [caoqianming]
+  - base get_object加锁时注意is_deleted过滤采用base_manager [caoqianming]
+  - base wf 调用方法支持静态方法 [caoqianming]
+  - mlogbw关于wpr的校验修改以支持手动新增 [caoqianming]
+  - resignatioin提交时调用的方法 [caoqianming]
+  - ResignationSerializer create bug [caoqianming]
+  - base ticketmixin添加ticket_auto_submit_on_create [caoqianming]
+  - resignation添加ticketMixin [caoqianming]
+  - base wfmixin 修改时校验 [caoqianming]
+  - base ticketDetail添加create_by_name [caoqianming]
+  - 短信发送功能未开启 [caoqianming]
+  - 批次号格式错误的校验 [caoqianming]
+  - mioitemcreate时接收count_send [caoqianming]
+  - mioitemw增加筛选条件 [caoqianming]
+  - wpr_bxerp优化mlogbw的获取 [caoqianming]
+  - do_out报错更明确 [caoqianming]
+  - 优化ana batchwork [caoqianming]
+  - 改版交接支持new_wm [caoqianming]
+  - ofm-models borrowRecord 增加借阅数量 [TianyangZhang]
+  - ofm-models  fix bug [TianyangZhang]
+  - feat : ofm -vehicle fix bug [TianyangZhang]
+  - ofm 修改车辆model 字段 [TianyangZhang]
+  - ofm-service  fix bug [TianyangZhang]
+  - feat：ofm-service 修改 bug [TianyangZhang]
+  - ofm -修改 view 字段 [TianyangZhang]
+  - ofm 修改 ofm 字段 并重新生成迁移文件 [TianyangZhang]
+  - base workflow添加分类字段 [caoqianming]
+  - ofm-views 修改 车辆字段 [TianyangZhang]
+  - ofm-vehicle 修改车辆审批申请 改完按时间段进行选择 [TianyangZhang]
+  - mioitem添加count_send字段 [caoqianming]
+  - 校验改版时选择的改版物料 [caoqianming]
+  - 导入物料明细支持直接从名称等匹配 [caoqianming]
+  - 增强新批次号校验 [caoqianming]
+  - 提供修改编号的接口 [caoqianming]
+  - supplieraudit采用新工作流挂载方式 [caoqianming]
+  - base 添加ticketmixin可集成到viewset下以支持工作流 [caoqianming]
+  - base 可跳过短信发送 [caoqianming]
+  - 反向操作时忽略明细校验 [caoqianming]
+  - 拦截new_batch的错误 [caoqianming]
+  - fix 修改 srm 的 views [TianyangZhang]
+  - base wfservice创建出工单时处理人为提交人 [caoqianming]
+  - feat：srm fix serializer [TianyangZhang]
+  - base handle_ticket 完善transition校验 [caoqianming]
+  - DatasetRecord添加filter [caoqianming]
+  - handover添加selectfield [caoqianming]
+  - 交接记录返回material_changed_fname [caoqianming]
+  - 改版交接必须为合批操作 [caoqianming]
+  - base 创建数据时检验不包含id2 [caoqianming]
+  - fix srm serializer [TianyangZhang]
+  - srm-service 去掉 platform  belong_dept [TianyangZhang]
+  - add new model platform '平台审批' [TianyangZhang]
+  - base 创建数据时检验不包含id [caoqianming]
+  - 添加供应商审核 [caoqianming]
+  - base 开始编写ticketMixin可自动挂载 [caoqianming]
+  - ResignationSerializer返回employee_id_number [caoqianming]
+  - base 添加EuModelViewSet [caoqianming]
+  - 离职申请支持删除 [caoqianming]
+  - Resignationserializer返回employee_name [caoqianming]
+  - base handle_ticket 默认参数 [caoqianming]
+  - 优化bind_resignation [caoqianming]
+  - base 优化wf create [caoqianming]
+  - ResignationViewSet添加RetrieveModelMixin [caoqianming]
+  - bind_resignation bug [caoqianming]
+  - 返回TicketSimpleSerializer [caoqianming]
+- fix: 问题修复
+  - repair swaggger显示问题 [caoqianming]
+  - 修改 ofm - vehicle 中的出发里程 [TianyangZhang]
+  - handoverserializer 关于new_wm的处理 [caoqianming]
+  - handovermerge时new_state未定义 [caoqianming]
+  - 修改印章申请binging_seal [TianyangZhang]
+  - update_mb_item时考虑检验的存在 [caoqianming]
+  - hrm-用人需求修改标题模板 [TianyangZhang]
+  - 先调整asm以启动服务 [caoqianming]
+  - do_in bug [caoqianming]
+  - base ticketmixin先创建再handle [caoqianming]
+  - fix ：修改提交审批报错 RelatedManager' object has no attribute 'belong_dept [TianyangZhang]
+  - fix : srm 修改 paperrecord 字段 cor_author 字段类型 [TianyangZhang]
+  - fix：srm 修改论文审批 反存 论文台账 主要修改model 字段类型 [TianyangZhang]
+  - srm 修改专利台账 [TianyangZhang]
+  - base wfmixin gen_ticket_data保存t_id转为str [caoqianming]
+  - fix : 修改ofm -views -vehicle && services [TianyangZhang]
+  - format_json_with_placeholders 处理decimal [caoqianming]
+  - base wf工作流分类接口detail错误 [caoqianming]
+  - do_in 可直接取用wm [caoqianming]
+  - material get_queryset忘记return qs [caoqianming]
+  - material增加count__gt等查询条件 [caoqianming]
+  - mioitem create时校验是否混批的bug [caoqianming]
+  - base handle_ticket处理ticket_title [caoqianming]
+  - bind_resignation bug [caoqianming]
+  - clean_data关于material的处理 [caoqianming]
 ## 3.0.2025120109
 - feat: 新增功能
   - 供应商审核通过后即可添加供应商 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index 4b37f2eb..b6b8b02e 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 = '3.0.2025120109'
+SYS_VERSION = '3.0.2025122514'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition