diff --git a/features/pm/performance.go b/features/pm/performance.go index c4d6b670..d4083af3 100644 --- a/features/pm/performance.go +++ b/features/pm/performance.go @@ -232,6 +232,7 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) { // kip_id ... "neType": kpiReport.Task.NE.NeType, "neName": kpiReport.Task.NE.NEName, + "rmUID": kpiReport.Task.NE.RmUID, "startIndex": kpiIndex, "timeGroup": startTime, } diff --git a/src/modules/system/controller/sys_tenant.go b/src/modules/system/controller/sys_tenant.go index 42fdb8e9..25233116 100644 --- a/src/modules/system/controller/sys_tenant.go +++ b/src/modules/system/controller/sys_tenant.go @@ -136,7 +136,7 @@ func (s *SysTenantController) Add(c *gin.Context) { uniqueTenantName := s.sysTenantService.CheckUniqueTenantName(body.TenantName, body.ParentID, "") if !uniqueTenantName { // 租户新增【%s】失败,租户名称已存在 - msg := i18n.TTemplate(language, "tenant.errNameExists", map[string]any{"name": body.TenantName}) + msg := i18n.TTemplate(language, "ERROR: tenant name already exists", map[string]any{"name": body.TenantName}) c.JSON(200, result.ErrMsg(msg)) return } @@ -144,7 +144,7 @@ func (s *SysTenantController) Add(c *gin.Context) { uniqueTenancy := s.sysTenantService.IsUniqueTenancy(body.TenantID, body.TenancyType, body.TenancyKey) if !uniqueTenancy { // 租赁对象添加失败,租赁对象已存在 - msg := i18n.TTemplate(language, "Tenancy object is exist", map[string]any{"key": body.TenancyKey}) + msg := i18n.TTemplate(language, "ERROR: tenancy key already exists", map[string]any{"key": body.TenancyKey}) c.JSON(200, result.ErrMsg(msg)) return } @@ -201,7 +201,7 @@ func (s *SysTenantController) Edit(c *gin.Context) { uniqueTenantName := s.sysTenantService.CheckUniqueTenantName(body.TenantName, body.ParentID, body.TenantID) if !uniqueTenantName { // 租户修改【%s】失败,租户名称已存在 - msg := i18n.TTemplate(language, "tenant.errNameExists", map[string]any{"name": body.TenantName}) + msg := i18n.TTemplate(language, "ERROR: tenant name already exists", map[string]any{"name": body.TenantName}) c.JSON(200, result.ErrMsg(msg)) return } @@ -209,7 +209,7 @@ func (s *SysTenantController) Edit(c *gin.Context) { uniqueTenancy := s.sysTenantService.IsUniqueTenancy(body.TenantID, body.TenancyType, body.TenancyKey) if !uniqueTenancy { // 租赁对象添加失败,租赁对象已存在 - msg := i18n.TTemplate(language, "Tenancy object is exist", map[string]any{"key": body.TenancyKey}) + msg := i18n.TTemplate(language, "ERROR: tenancy key already exists", map[string]any{"key": body.TenancyKey}) c.JSON(200, result.ErrMsg(msg)) return }