Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

ludc

2023-08-04 5edd1056e46c51e501f7377f1a1b0a12e4d22504

 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();