From 2d1fa2a824ca1cbeac13b5b7e542db892f1743e4 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 16 May 2025 09:55:38 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=202.2505.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md       | 10 ++++++++++
 makefile           |  2 +-
 mkpkg.sh           |  2 +-
 restagent/makefile |  2 +-
 sshsvc/makefile    |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef6a1990..1ca117b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # 版本发布日志
 
+## 2.2505.2-20250516
+
+- 更新 备份导出功能，调整文件路径和清除告警表字段缺失
+- 新增 添加任务标题字段，优化跟踪任务的创建和查询功能
+- 更新 告警参数描述，修正CPU使用率计算逻辑, license检查天数错误
+- 修复 调度任务告警检查插入数据中的NeId字段为RmUID
+- 修复 voip export task issue
+- 修复 export file time format set to 2025-05-13 13:59:59 GMT+08:00
+- 优化 time format set to 2022-12-30 01:01:59 GMT+08:00
+
 ## 2.2505.1-20250509
 
 - 新增 cdr导出文件加网元名称区分
diff --git a/makefile b/makefile
index c56f0dc2..48c717be 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2505.1
+VERSION = 2.2505.2
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/mkpkg.sh b/mkpkg.sh
index 4ca91261..c63e3ed8 100755
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@
 
 ProcList="restagent sshsvc"
 ProjectL=omc
-VERSION=2.2505.1
+VERSION=2.2505.2
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
diff --git a/restagent/makefile b/restagent/makefile
index 4e7e8b60..67e1f0cb 100644
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2505.1
+VERSION = 2.2505.2
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/sshsvc/makefile b/sshsvc/makefile
index 7ecd47a7..696d41ec 100644
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2505.1
+VERSION = 2.2505.2
 LIBDIR = be.ems/lib
 BINNAME = sshsvc