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

# Conflicts: # adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java # adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
2021-07-05 15:43:45 +08:00
parent 2f462ccdb7 367b0f5f7c
commit 2004286bca
31 changed files with 491 additions and 61 deletions
@@ -15,6 +15,9 @@ public class ActDefineStartMap {

        Map<String,String> map = new TreeMap<>();
        map.put("1","standardLibraryWkflow");
+        map.put("2","standardSurveyWorkFlow");
+        map.put("3","standardCommentProcessWorkFlow");
+
        map.put("3","standardregulatoryinventory");
        return map.get(type);
    }