Merge branch 'qa_merge_shunyi_vr_map' into dev2

Browse Source

# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

...

This commit is contained in:

wangcongtao

2021-01-26 09:26:48 +08:00

parent f16d5f9a66 0d0c39af67

commit 233ba7b89f

26 changed files with 707 additions and 229 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

modules/mogo-module-common/src/main/res/raw/carblue.n3d Normal file

Binary file not shown.