From 5de1e8c32e4d759e7c31827ae0b8158584fb77a4 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 23 Aug 2023 09:33:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basicdata/feign/IBasicdataWarehouseClient.java | 2 +- .../com/logpm/warehouse/api/WarehouseTrayTypeApiController.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java index 15d90db36..5f7e6fc26 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java @@ -99,7 +99,7 @@ public interface IBasicdataWarehouseClient { * @return */ @GetMapping(API_PREFIX+"/getMyCurrentWarehouse") - BasicdataWarehouseEntity getMyCurrentWarehouse(); + Object getMyCurrentWarehouse(); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index 9efe16285..5ab10cbb5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -2,7 +2,6 @@ package com.logpm.warehouse.api; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.warehouse.dto.TrayTypeDTO; import com.logpm.warehouse.dto.ZeroOrderVO; @@ -693,7 +692,6 @@ public class WarehouseTrayTypeApiController { Long marketId = trayTypeDTO.getMarketId(); String materialCode = trayTypeDTO.getMaterialCode(); try{ - BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if(Objects.isNull(marketId)){ log.warn(method+"商场id不能为空 marketId={}",marketId); return R.fail(403,"商场id不能为空");