springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightResourceSharingServiceImpl.java
@@ -22,10 +22,10 @@ @Override public IPage<NewFightResourceSharingDTO> getList(int pageNum, int pageSize, String communityId, String unitId) public IPage<NewFightResourceSharingDTO> getList(int pageNum, int pageSize, String communityId, String unitId,String meritId) { Page page = new Page<>(pageNum,pageSize); return baseMapper.getList(page,communityId,unitId); return baseMapper.getList(page,communityId,unitId,meritId); } @Override