Merge branch 'develop_master' into develop_3

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow")
+@FeignClient(value = "bat-wkflow-zqazqazqa")
 public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -15,7 +15,8 @@ public class ActDefineStartMap {
 
         Map<String,String> map = new TreeMap<>();
         map.put("1","standardLibraryWkflow");
+        map.put("2","standardSurveyWorkFlow");
 
         return map.get(type);
     }
-}
+}