解决冲突

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

@@ -21,11 +21,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableCircuitBreaker
 @SpringBootApplication
-<<<<<<< HEAD
+
 @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"})
->>>>>>> e9911094119cad2d7b0bff037cd693c7d9e55569
+//@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform"})
 @EnableScheduling
 @EnableAceAuthClient
 @EnableAceCache

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

@@ -20,11 +20,8 @@ import com.xxfc.platform.vehicle.pojo.CataVo;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Arrays;
 import org.springframework.aop.framework.AopContext;
-<<<<<<< HEAD
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.aop.support.AopUtils;
-=======
->>>>>>> e9911094119cad2d7b0bff037cd693c7d9e55569
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -159,10 +156,6 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
             parent.setRank(0);
             mapper.insertSelective(parent);
             Integer parentId = parent.getId();
-<<<<<<< HEAD
-=======
-           int  i = 1/0;
->>>>>>> e9911094119cad2d7b0bff037cd693c7d9e55569
             //取出二级标签
             List<VehiclePlatCata> childrens = cascade.getChildren();
             //逐条插入二级标签