diff --git a/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java b/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java index 4db83171..b99a8424 100644 --- a/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java +++ b/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java @@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; - @Slf4j @RestController("commonTaihuWelfare") @RequestMapping("common/taihuWelfare") diff --git a/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java index 79f455f9..c92a9517 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java @@ -35,7 +35,7 @@ public class TaihuWelfareServiceImpl extends ServiceImpl shopStoreToProductEntityPage = shopStoreToProductDao.selectPage(new Page<>(param.getPage(), param.getLimit()), wrapper); - return R.ok().put("page",shopStoreToProductEntityPage); + Page shopProductPage = shopStoreToProductDao.selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ShopProduct.class, wrapper); + return R.ok().put("page",shopProductPage); } }