Merge remote-tracking branch 'origin/master'

xiejun

2023-06-15 235560b9d7cff1d7dce1f90a08df56d6ef8dd682

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java

@@ -51,7 +51,7 @@
   @Override
   @GetMapping(GET_DETAIL)
   public R<BtmTypeVO> getDetail(String oid) {
      return R.data(btmTypeService.getAllAttributeByBtmOid(oid));
      return R.data(btmTypeService.getBtmTypeByOid(oid));
   }

   /**