合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java

@@ -30,9 +30,9 @@

    @Autowired
    private RewardPunishmentDetailRepository rewardPunishmentDetailRepository;



    
    
	
   @Override
    public ResultVO queryAll(PageQuery<RewardPunishmentDetailQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
@@ -64,4 +64,4 @@
    public List<RewardPunishmentDetail> queryAllRelation(RewardPunishmentDetailQueryCriteria criteria) {
        return baseMapper.queryAll(criteria.getPersonId());
    }
}
}