Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

昨天 bb6d3de7c1758fc0e4d3e8e2f364c28b501e65b4

 src/main/java/com/ruoyi/approve/service/IApproveProcessService.java

@@ -27,7 +27,7 @@

    IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess);

    void delApprove(Long[] ids);
    void delApprove(List<Long> ids);

    void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException;