Merge branch 'dev_1.1.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_1.1.2

# Conflicts:
#	app/build.gradle
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	settings.gradle
This commit is contained in:
tongchenfei
2020-08-10 14:46:39 +08:00
59 changed files with 925 additions and 545 deletions

View File

@@ -231,7 +231,7 @@ public class MogoServicePaths {
* 日志上传
*/
@Deprecated
public static final String PATH_LOG_LIB = "/loglib/api";
public static final String PATH_MOGO_MONITOR = "/monitor/api";
/**
* 探路api