1.修改循环依赖2

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTeamStaffServiceImpl.java

@@ -34,6 +34,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.IUserClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -49,9 +50,10 @@ import java.util.List;
 @AllArgsConstructor
 public class BasicdataTeamStaffServiceImpl extends BaseServiceImpl<BasicdataTeamStaffMapper, BasicdataTeamStaffEntity> implements IBasicdataTeamStaffService {
 
-	private final IBasicdataWarehouseService basicdataWarehouseService;
+	@Autowired
-
+	private  IBasicdataWarehouseService basicdataWarehouseService;
-	private IUserClient userClient;
+	@Autowired
+	private  IUserClient userClient;
 
 	@Override
 	public IPage<BasicdataTeamStaffVO> selectBasicdataTeamStaffPage(IPage<BasicdataTeamStaffVO> page, BasicdataTeamStaffVO basicdataTeamStaff) {

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -83,9 +83,6 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	private BasicdataStorageServicesMapper basicdataStorageServicesMapper;
 
 
-//	private
-
-
 	@Override
 	public IPage<BasicdataWarehouseVO> selectWarehouseWarehousePage(IPage<BasicdataWarehouseVO> page, BasicdataWarehouseVO warehouseWarehouse) {
 		return page.setRecords(baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse));