From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java
index 3688d3a..0b31fca 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyTemplateWrapper.java
@@ -38,12 +38,10 @@
@Override
public CodeClassifyTemplateVO entityVO(CodeClassifyTemplate plCodeClstemplate) {
CodeClassifyTemplateVO plCodeClstemplateVO = Objects.requireNonNull(BeanUtil.copy(plCodeClstemplate, CodeClassifyTemplateVO.class));
-
//User createUser = UserCache.getUser(plCodeClstemplate.getCreateUser());
//User updateUser = UserCache.getUser(plCodeClstemplate.getUpdateUser());
//plCodeClstemplateVO.setCreateUserName(createUser.getName());
//plCodeClstemplateVO.setUpdateUserName(updateUser.getName());
-
return plCodeClstemplateVO;
}
--
Gitblit v1.9.3