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

This commit is contained in:
tongchenfei
2020-07-09 17:42:21 +08:00
2 changed files with 3 additions and 3 deletions

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

View File

@@ -62,9 +62,9 @@ MOGO_MODULE_OBU_VERSION = 1.2.1.10-SNAPSHOT
# 探路
MOGO_MODULE_TANLU_VERSION=1.3.0.1-SNAPSHOT
# 车聊聊
CARCHATTING_VERSION=1.3.1
CARCHATTING_VERSION=1.3.2
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.3.1
CARCHATTINGPROVIDER_VERSION=1.3.2
# 视频引导
MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT
# 视频引导接口