springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
@@ -44,7 +44,7 @@ Page page = new Page<>(); page.setSize(pageConvenientMerchantDTO.getPageSize()); page.setCurrent(pageConvenientMerchantDTO.getPageNum()); IPage<JinhuiConvenientMerchantVO> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO); IPage<JinhuiConvenientMerchant> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO); return R.ok(iPage); }