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

liyong

7 天以前 877504ede165b8c965b6cf6599708e7e48778034

 src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java

@@ -135,6 +135,9 @@
            approveProcess.setApproveUserCurrentId(approveNode1.getApproveNodeUserId());
            approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
        }
        if (approveProcess.getApproveStatus() != 1){
            approveProcess.setApproveOverTime(new Date());
        }
        approveProcessMapper.updateById(approveProcess);

        // 绑定附件