Merge remote-tracking branch 'origin/master'

wangting

2023-07-06 b379f48fc13255c4a8d946f1c87678512a133107

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

@@ -171,6 +171,7 @@
    * @return 默认字段属性
    */
   @Override
   @GetMapping(GET_DEFAULT_ATTR_BY_BTM_ID)
   public R<BtmTypeVO> getDefaultAttrByBtmId(String btmTypeId) {
      return R.data(Optional.ofNullable(btmTypeService.getDefaultAttrByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
   }
@@ -182,6 +183,7 @@
    * @return 所有字段
    */
   @Override
   @GetMapping(GET_ALL_ATTR_BY_BTM_ID)
   public R<BtmTypeVO> getAllAttributeByBtmId(String btmTypeId) {
      return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
   }
@@ -193,6 +195,7 @@
    * @return 所有字段
    */
   @Override
   @GetMapping(GET_ALL_ATTR_BY_BTM_OID)
   public R<BtmTypeVO> getAllAttributeByBtmOid(String btmTypeOid) {
      return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmOid(btmTypeOid)).orElseGet(BtmTypeVO::new));
   }