Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

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

@@ -32,9 +32,9 @@

    @Autowired
    private WorkApproveRepository workApproveRepository;



    
    
	
   @Override
    public ResultVO queryAll(PageQuery<WorkApproveQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
@@ -75,4 +75,4 @@
        workApprove.setApproveStatus(3);
        this.updateById(workApprove);
    }
}
}