Merge branch 'dev'

xiangpei

4 天以前 e85cd3fe826efe0baaa3fc09ea371467127c370c

 flowable/src/main/java/com/ycl/mapper/ProcessLogMapper.java

@@ -37,7 +37,10 @@
     * @param query
     * @return
     */
    List<ProcessLogVO> projectProcessLogPage(@Param("query") ProcessLogQuery query);
    List<ProcessLogVO> projectProcessLogList(@Param("query") ProcessLogQuery query);


    IPage projectProcessLogPage(IPage page, @Param("query") ProcessLogQuery query);

    List<String> getAllHangup();