From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeAttributeWrapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeAttributeWrapper.java
index 9186157..4b4222b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeAttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeAttributeWrapper.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.omd.wrapper;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.vci.ubcs.omd.cache.EnumCache;
 import com.vci.ubcs.omd.constant.BtmTypeConstant;
 import com.vci.ubcs.omd.entity.LinkTypeAttribute;
 import com.vci.ubcs.omd.vo.LinkTypeAttributeVO;
@@ -29,6 +30,7 @@
 	@Override
 	public LinkTypeAttributeVO entityVO(LinkTypeAttribute entity) {
 		LinkTypeAttributeVO vo = BeanUtil.copy(entity, LinkTypeAttributeVO.class);
+		vo.setAttrDataTypeText(EnumCache.getValue("attributeType",vo.getAttrDataType()));
 		return vo;
 	}
 
@@ -49,6 +51,8 @@
 		attributeDO.setCreateTime(now);
 		attributeDO.setTs(now);
 		attributeDO.setOwner(creator);
+		attributeDO.setLastModifier(creator);
+		attributeDO.setLastModifyTime(now);
 		attributeDO.setBtmName(BtmTypeConstant.LINK_TYPE_ATTRIBUTE);
 		return attributeDO;
 	}

--
Gitblit v1.9.3