Browse Source

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

master

buaixuexideshitongxue 1 month ago

parent

68b11b7193 226c99f06d

commit

13795ad451

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available