解决冲突-EntranceFragment再验证一遍

2021-09-15 19:57:10 +08:00
parent f270ea54c6
commit 99cd66191c
6 changed files with 28 additions and 66 deletions
--- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
@@ -370,18 +370,14 @@ public class MogoServicePaths {
    @Deprecated
    public static final String PATH_ADAS = "/adas/api";

-    /**
-     * 前方碰撞预警  未碰撞
-     */
-<<<<<<< HEAD
-    public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
-
    /**
     * 车辆检测 模块
     */
    public static final String PATH_CHECK = "/check/api";

-=======
+    /**
+     * 前方碰撞预警  未碰撞
+     */
    @Keep
    @Deprecated
    public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
@@ -399,5 +395,4 @@ public class MogoServicePaths {
    @Keep
    @Deprecated
    public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api";
->>>>>>> dev/dev_eagle_architecture_upgrade
 }