Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 java110-bean/src/main/java/com/java110/dto/workflow/WorkflowDto.java

old mode 100644
new mode 100755
@@ -32,6 +32,14 @@
    public static final String FLOW_TYPE_CONTRACT_CHANGE = "60006";//合同变更审核


    //物品调拨
    public static final String FLOW_TYPE_ALLOCATION_STOREHOUSE = "70007";//物品调拨


    //物品被调拨
    public static final String FLOW_TYPE_ALLOCATION_STOREHOUSE_GO = "80008";//物品被调拨



    public static final String DEFAULT_SKIP_LEVEL = "1";

@@ -46,6 +54,7 @@
    private String flowType;
    private String flowTypeName;
    private String processDefinitionKey;
    private String operationType;

    private String[] flowTypes;

@@ -162,4 +171,12 @@
    public void setFlowTypes(String[] flowTypes) {
        this.flowTypes = flowTypes;
    }

    public String getOperationType() {
        return operationType;
    }

    public void setOperationType(String operationType) {
        this.operationType = operationType;
    }
}