1、资产管理联调处理

yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/controller/admin/assetinfo/vo/AssetInfoRespVO.java

@@ -60,7 +60,7 @@ public class AssetInfoRespVO {
 
     @Schema(description = "领用人姓名")
     @ExcelProperty("领用人姓名")
-    private Long receiveEmployeeName;
+    private String receiveEmployeeName;
 
     @Schema(description = "领用信息表主键id")
     @ExcelProperty("领用信息表主键id")

yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/controller/admin/assetinfo/vo/AssetInfoRetireReqVO.java

@@ -12,7 +12,7 @@ public class AssetInfoRetireReqVO {
 
     @Schema(description = "资产信息主键自增id",requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
     @NotNull(message = "资产信息主键自增id不能为空")
-    private Long id;
+    private Long assetInfoId;
 
     @Schema(description = "报废日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-08-08")
     @NotBlank(message = "报废日期不能为空")

yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/service/assetinfo/AssetInfoServiceImpl.java

@@ -152,7 +152,7 @@ public class AssetInfoServiceImpl implements AssetInfoService {
 
     @Override
     public void retireInfo(AssetInfoRetireReqVO retireReqVO) {
-        Long id = retireReqVO.getId();
+        Long id = retireReqVO.getAssetInfoId();
         AssetInfoDO assetInfoDO = validateInfoExists(id);
         if (AssetStateEnum.OCCUPIED.getState().equals(assetInfoDO.getAssetState())) {
             throw exception(new ErrorCode(OCCUPIED_ASSET_NOT_ALLOWED_DELETE.getCode(), "资产正在使用，不能报废"));