修改

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/CarClientFallback.java

@@ -64,8 +64,8 @@ public class CarClientFallback implements ICarClient {
         }
 
 	@Override
-	public R<BladePage<CarVO>> page(CarDTO carDTO) {
-		return R.data(null);
+	public BladePage<CarVO> page(CarDTO carDTO) {
+		return null;
 	}
 
 

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/ICarClient.java

@@ -75,5 +75,5 @@ public interface ICarClient  {
 	 * @return
 	 */
 	@PostMapping("/page")
-	R<BladePage<CarVO>> page(@RequestBody CarDTO carDto);
+	BladePage<CarVO> page(@RequestBody CarDTO carDto);
 }

blade-service/estate/src/main/java/org/springblade/estate/feign/CarClient.java

@@ -108,14 +108,14 @@ public class CarClient implements ICarClient {
 
 	@Override
 	@PostMapping("/page")
-	public R<BladePage<CarVO>> page(@RequestBody CarDTO carDto) {
+	public BladePage<CarVO> page(@RequestBody CarDTO carDto) {
 		Car car = new Car();
 		BeanUtil.copyProperties(carDto, car);
 		QueryWrapper<Car> queryWrapper = Condition.getQueryWrapper(car);
 		queryWrapper.lambda().orderByDesc(Car::getCreateTime);
 		IPage<Car> carIPage = this.carService.page(Condition.getPage(carDto.getQuery()), queryWrapper);
 		IPage<CarVO> pageVO = CarWrapper.build().pageVO(carIPage);
-		return R.data(BladePage.of(pageVO));
+		return BladePage.of(pageVO);
 	}
 
 

community-app-gateway/src/main/java/org/springblade/app/controller/CarController.java

@@ -92,7 +92,7 @@ public class CarController {
 		carDTO.setMemberId(memberId);
 		carDTO.setResidentialId(residentialId);
 		carDTO.setUserIdCard(member.getIdcard());
-		return carClient.page(carDTO);
+		return R.data(carClient.page(carDTO));
 	}
 
 	@GetMapping(value = "/page/admin")
@@ -100,6 +100,6 @@ public class CarController {
 		CarDTO carDTO = new CarDTO();
 		carDTO.setQuery(query);
 		carDTO.setResidentialId(residentialId);
-		return carClient.page(carDTO);
+		return R.data(carClient.page(carDTO));
 	}
 }