Merge branch 'dev'

xiangpei

4 天以前 e85cd3fe826efe0baaa3fc09ea371467127c370c

 business/src/main/java/com/ycl/controller/FlowLogController.java

@@ -39,6 +39,7 @@
    @ApiOperation(value = "流程推进日志", notes = "流程推进日志")
//    @PreAuthorize("@ss.hasPermi('flowLog:page')")
    public Result projectProcessLogPage(ProcessLogQuery query) {
        return processLogService.projectProcessLogPage(query);
        query.setDeleted(null);
        return processLogService.projectProcessLogList(query);
    }
}