From f2e8b17c7df35a8efb3b32d821bea54775b253ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 21:22:40 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 606c7e8..fc99a8c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -938,7 +938,8 @@
 	 * @param attrName 灞炴�х殑鍚嶅瓧
 	 * @return true 琛ㄧず搴旇蹇界暐
 	 */
-	boolean checkUnAttrUnEdit(String attrName){
+	@Override
+	public boolean checkUnAttrUnEdit(String attrName){
 		return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
 			||"ts".equalsIgnoreCase(attrName)
 			|| "lastmodifier".equalsIgnoreCase(attrName)

--
Gitblit v1.9.3