Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java
This commit is contained in:
wangcongtao
2020-11-20 09:53:42 +08:00
589 changed files with 14439 additions and 504 deletions

View File

@@ -23,6 +23,11 @@
<dimen name="module_service_content_minWidth">120px</dimen>
<dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
<dimen name="modle_car_panel_call">98px</dimen>
<dimen name="modle_car_panel_call_margin">46px</dimen>
<dimen name="modle_car_panel_call_margin_left">40px</dimen>
<dimen name="module_services_online_car_panel_marginTop">2px</dimen>
<dimen name="module_services_online_car_panel_marginBottom">2px</dimen>
<dimen name="module_services_online_car_panel_marginRight">0px</dimen>