From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 15 一月 2025 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 008f760..cb2d73f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -108,7 +108,7 @@
}
statusVO.setDescription(statePool.description);
statusVO.setId(statePool.name);
- statusVO.setName(statePool.tag);
+ statusVO.setName(statePool.label);
}
return statusVO;
}
@@ -379,7 +379,7 @@
statePool.oid = statusDTO.getOid();
statePool.id = "";
statePool.name = statusDTO.getId();
- //statePool.imagePath = statusDTO.getImagePath();
+ statePool.imagePath = statusDTO.getImagePath();
statePool.description = statusDTO.getDescription()==null?"":statusDTO.getDescription();
String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
long now = VciDateUtil.getNowTime();
@@ -388,7 +388,7 @@
statePool.modifier = userId;
statePool.modifyTime = now;
statePool.ts = statusDTO.getTs()==null?VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat):VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
- statePool.tag = statusDTO.getName();
+ statePool.label = statusDTO.getName();
return statePool;
}
@@ -575,7 +575,7 @@
statePool.modifier = statusVO.getLastModifier();
statePool.modifyTime = VciDateUtil.getTime(statusVO.getLastModifyTime());
statePool.ts = statusVO.getTs()==null?now:VciDateUtil.date2Str(statusVO.getTs(),VciDateUtil.DateTimeMillFormat);
- statePool.tag = statusVO.getName();
+ statePool.label = statusVO.getName();
return statePool;
}
--
Gitblit v1.9.3