From d7d73c863b7ed248a837b6199f9a7a2cd890aec7 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 8 Jan 2025 12:24:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/controller/SupermarketSpuController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java index 5a7ae4911..e4ae80dca 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java @@ -191,7 +191,7 @@ public class SupermarketSpuController { @Operation(summary = "APP根据条件查询分页SPU" , description = "APP条件分页查询" ) @PostMapping("/app/selectListAll" ) @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" ) - public R> getSupermarketSpu(@RequestBody SupermarketSpuAppQueryDTO supermarketSpuQueryDTO,@ParameterObject Page page) { + public R getSupermarketSpu(@RequestBody SupermarketSpuAppQueryDTO supermarketSpuQueryDTO,@ParameterObject Page page) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(supermarketSpuQueryDTO.getMerchantId() != null, SupermarketSpuEntity::getMerchantId, supermarketSpuQueryDTO.getMerchantId()); // wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductCode()), SupermarketSpuEntity::getProductCode, supermarketSpuQueryDTO.getProductCode()); @@ -201,7 +201,7 @@ public class SupermarketSpuController { List list = pageDate.getRecords(); List bean = BeanUtils.toBean(list, SupermarketAppSpuVo.class); pageDate.setRecords(bean); - return R.ok(bean); + return R.ok(pageDate); } /**