From 9be1b8fb3e4524f69e4ae4c65c33abd6adc4d58f Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 7 Jun 2025 10:06:27 +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.4?=
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 c8c92032..4c3662b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # 版本发布日志
 
+## 2.2505.4-20250607
+
+- 修复 修改获取告警历史同步成功响应码
+- 修复 修改网元告警ID为RmUID,时间字段导致插入错误
+- 修复 AMF-KPI注释掉不必要的EPS附着相关记录
+- 修复 开放自定义KPI管理页面和mml开启suci
+- 修复 告警清除对自定义产生的AlarmId处理
+- 修复 网元激活码多行行内容提取
+- 修复 SMF/MME/SMSC-KPI注释掉不必要的相关记录
+
 ## 2.2505.3-20250523
 
 - 修复 网元OAM配置读取与写入逻辑，修复键名不一致问题
diff --git a/makefile b/makefile
index ec6bce7e..4e9e73f3 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2505.3
+VERSION = 2.2505.4
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/mkpkg.sh b/mkpkg.sh
index 79f26ba5..09ef669e 100755
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@
 
 ProcList="restagent sshsvc"
 ProjectL=omc
-VERSION=2.2505.3
+VERSION=2.2505.4
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
diff --git a/restagent/makefile b/restagent/makefile
index ac0d066e..1a0c729a 100644
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2505.3
+VERSION = 2.2505.4
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/sshsvc/makefile b/sshsvc/makefile
index 909a64d6..197ac997 100644
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2505.3
+VERSION = 2.2505.4
 LIBDIR = be.ems/lib
 BINNAME = sshsvc