Merge branch 'dev'

xiangpei

4 天以前 e85cd3fe826efe0baaa3fc09ea371467127c370c

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

@@ -40,6 +40,6 @@
//    @PreAuthorize("@ss.hasPermi('flowLog:page')")
    public Result projectProcessLogPage(ProcessLogQuery query) {
        query.setDeleted(null);
        return processLogService.projectProcessLogPage(query);
        return processLogService.projectProcessLogList(query);
    }
}