springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
@@ -46,11 +46,11 @@ @Override public R getList(int pageNum, int pageSize, String goodsId, String orderNumber, String goodsName, String condition, String userName,String communityId, String userId,String orderType) { String userId,String orderType,String merchantId) { Page page=new Page<VolunteerCreditsExchange>(pageNum,pageSize); return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition, userName,communityId,userId,orderType)); userName,communityId,userId,orderType,merchantId)); } @Override