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/flow/action/SecondApproveReturnAction.java
# src/main/java/com/biutag/supervision/pojo/entity/Negative.java
|