Merge branch 'dev_robotaxi-d_250417_8.0.0_routing' into dev_robotaxi-d_250709_8.2.0_advideo

# Conflicts:
#	OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt
#	OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
This commit is contained in:
yangyakun
2025-07-29 16:43:30 +08:00
145 changed files with 4302 additions and 1389 deletions

View File

@@ -10,7 +10,7 @@
org.gradle.daemon=true
org.gradle.configureondemand=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx6144m
org.gradle.jvmargs=-Xmx10240m
#开启gradle缓存
org.gradle.caching=true
android.enableBuildCache=true