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

liyong

3 天以前 4635770544e2d57416ad88a8983ee293919f5fec

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

@@ -17,5 +17,5 @@

    void updateApproveNode(ApproveNode approveNode) throws IOException;

    void delApproveNodeByApproveId(Long id);
    void delApproveNodeByApproveId(String id);
}