1.代码还原

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

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不能为空");