Merge branch 'dev_robotaxi-d_231205_6.2.6' into dev_robotaxi-d_231218_6.2.6

# Conflicts: # OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
2023-12-18 11:28:25 +08:00
parent 4e7a4eb9fb 58a35b2bfc
commit b24e2443f3
1189 changed files with 7194 additions and 1825 deletions
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -15,8 +15,8 @@
      "passenger": ["ochDFHQ"]
    },
    "bus" :{
-      "driver": ["ochJL"],
-      "passenger": ["ochJL"]
+      "driver": ["ochJL","ochM2"],
+      "passenger": ["ochJL","ochM2"]
    },
    "charter" :{
      "driver": ["ochM1"],
@@ -56,8 +56,8 @@
      "passenger": ["ochJL","ochM2"]
    },
    "bus" :{
-      "driver": ["ochJL"],
-      "passenger": ["ochJL"]
+      "driver": ["ochJL","ochM2"],
+      "passenger": ["ochJL","ochM2"]
    },
    "charter" :{
      "driver": ["ochM1"],