Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java
#	src/main/java/com/biutag/supervision/flow/action/ConfirmationCompletionAction.java
#	src/main/java/com/biutag/supervision/flow/action/FirstApproveReturnAction.java
#	src/main/java/com/biutag/supervision/flow/action/SecondApproveAction.java
#	src/main/java/com/biutag/supervision/pojo/entity/Negative.java

src/main/java/com/biutag/supervision/flow/action/SecondApproveReturnAction.java

@@ -68,6 +68,8 @@ public class SecondApproveReturnAction implements Action {
                 .set(Negative::getProcessingStatus, ProcessingStatusEnum.processing.name())
                 // 当前处理对象
                 .set(Negative::getCurrentProcessingObject, String.format("%s专班", negative.getHandleThreeDepartName()))
+                // 退回整改后，重新设置二级审批开始时间，下次二级审批完成后继续累加
+                .set(Negative::getSecondApproveStartTime, LocalDateTime.now())
                 .eq(Negative::getId, negativeId));
     }