Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -53,7 +53,7 @@ public interface UserFeign {
      * @return
      */
     @RequestMapping(value = "/member/app/unauth/level/{type}", method = RequestMethod.GET)
-    public BaseUserMemberLevel level(@PathVariable Integer type);
+    public BaseUserMemberLevel level(@PathVariable(value = "type") Integer type);
 
     /**
      * 批量获取用户基本信息

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java

@@ -21,9 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableCircuitBreaker
 @SpringBootApplication
-
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"})
-//@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform"})
+@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform"})
 @EnableScheduling
 @EnableAceAuthClient
 @EnableAceCache

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/VehicleApplication.java

@@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform.vehicle.feign"})
+@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform.vehicle.feign"})
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.vehicle.mapper")
 public class VehicleApplication {