Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import feign.Response;
 
-@FeignClient(name = "AMOS-API-WORKFLOW-CHENZHAO", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -32,6 +32,12 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
 			<version>2.0.8</version>
+			 <exclusions>
+                <exclusion>
+                    <artifactId>servlet-api</artifactId>
+                    <groupId>javax.servlet</groupId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 	</dependencies>