Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9

Browse Source

# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java

...

This commit is contained in:

wangcongtao

2021-01-05 19:27:13 +08:00

parent 40afbccfcc 8be440d6b2

commit e6600df3a3

570 changed files with 644 additions and 10499 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

0

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java