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/mapper/CodeBasicSecMapper.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/mapper/CodeBasicSecMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java index 3b04b04..2c2ba9e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java @@ -27,10 +27,10 @@ /** * 鎵归噺鎻掑叆 - * @param codeBasicSecList + //* @param codeBasicSecList * @return */ - Long insertBatch(@Param("entities") List<CodeBasicSec> codeBasicSecList); + // Long insertBatch(@Param("entities") List<CodeBasicSec> codeBasicSecList); List<String> getOidByCodeclassifysecOid(@Param("codeClassifySecOid") String codeClassifySecOid); -- Gitblit v1.9.3