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

gongchunyi

昨天 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 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;