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/CodeButtonServiceImpl.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/CodeButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
index 61eb4aa..8fba98f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
@@ -118,7 +118,7 @@
 		//灏咲TO杞崲涓篋O
 		CodeButton codeButtonDO = new CodeButton();
 		BeanUtilForVCI.copyPropertiesIgnoreCase(codeButtonDTO,codeButtonDO);
-		DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeButtonDO, MdmBtmTypeConstant.CODE_BUTTON,null);
+		DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeButtonDO, MdmBtmTypeConstant.CODE_BUTTON);
 		boolean resInsertCodeButton = codeButtonMapper.insert(codeButtonDO) > 0;
 		return resInsertCodeButton ? codeButtonDO2VO(codeButtonDO):null;
 	}
@@ -135,7 +135,7 @@
 		//灏咲TO杞崲涓篋O
 		CodeButton codeButtonDO = selectByOid(codeButtonDTO.getOid());
 		revisionModelUtil.copyFromDTOIgnore(codeButtonDTO,codeButtonDO);
-		DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeButtonDO,null);
+		DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeButtonDO);
 		boolean resUpdateCodeButton = codeButtonMapper.updateById(codeButtonDO) > 0;
 		return resUpdateCodeButton ? codeButtonDO2VO(codeButtonDO):null;
 	}

--
Gitblit v1.9.3