Merge remote-tracking branch 'origin/master'

xiejun

2023-09-19 fa88e9db762902e8c636c6a07c33c6aea911d823

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java

@@ -497,7 +497,7 @@
         transaction = dataSourceTransactionManager.getTransaction(def);
         // 获得事务状态
      }*/
      checkBtmTypeBeforeSave(btmTypeDTO);
//    checkBtmTypeBeforeSave(btmTypeDTO);
      BtmType btmTypeDO = Optional.ofNullable(BeanUtil.copy(btmTypeDTO, BtmType.class)).orElseGet(BtmType::new);
      btmTypeDO.setBizDomain(btmTypeDTO.getBizDomain());
      List<BtmTypeLinkAttributesDTO> attributes = btmTypeDTO.getAttributes();