From f099be6e30adfdea4580b09e33d75dc146a7a475 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 09:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
index 325c9e7..1186d51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
@@ -72,7 +72,7 @@
 		VciBaseUtil.alertNotNull(dockingSystemDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
 		//灏咲TO杞崲涓篋O
 		DockingSystem dockingSystem = Objects.requireNonNull(BeanUtil.copy(dockingSystemDTO, DockingSystem.class));
-		DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystem, MdmBtmTypeConstant.SYS_INT_BASE,null);
+		DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystem, MdmBtmTypeConstant.SYS_INT_BASE);
 		dockingSystem.setLctid(CODE_RULE_LC);
 		dockingSystem.setLcStatus(FRAMEWORK_RELEASE_EDITING);
 		boolean resInsert = dockingSystemMapper.insert(dockingSystem) > 0;
@@ -108,7 +108,7 @@
 			userClient.updateUserByAccount(dockingSystem.getId(),dockingSystemDTO.getId().toLowerCase(Locale.ROOT));
 		}
 		revisionModelUtil.copyFromDTOIgnore(dockingSystemDTO,dockingSystem);
-		DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingSystem,null);
+		DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingSystem);
 		dockingSystemMapper.updateById(dockingSystem);
 		return DockingSystemWrapper.build().entityVO(dockingSystem);
 	}

--
Gitblit v1.9.3