Merge branch 'dev_medical_morelogin' into dev_medical

# Conflicts:
#	m-im/build.gradle

config.gradle

@@ -11,6 +11,7 @@ ext {
             "m-user"          : "0.0.61.90",
             "m-user-medical"  : "0.0.61.94",
             "m-home"          : "0.0.22.70",
+            "m-im-medical"    : "0.0.20.77",
             "m-im"            : "0.0.20.76",
             "m-im-medical"    : "0.0.20.82",
             "m-dynamic"       : "0.0.7.28",
@@ -97,6 +98,7 @@ ext {
             "m-user"          : "0.0.61.90",
             "m-user-medical"  : "0.0.61.94",
             "m-home"          : "0.0.22.70",
+            "m-im-medical"    : "0.0.20.77",
             "m-im"            : "0.0.20.76",
             "m-im-medical"    : "0.0.20.82",
             "m-dynamic"       : "0.0.7.28",

m-im/src/main/java/com/yidianling/im/config/NimSDKOptionConfig.java

@@ -39,7 +39,8 @@ class NimSDKOptionConfig {
             options.checkManifestConfig = true;
         }
         options.appKey = getIMAppKey(configBean);
-
+        //多端登录  安卓端：咨询师1 、医疗医生端2、壹点灵心理咨询主包3、壹点灵心理咨询马甲包4、医疗用户端5
+        options.loginCustomTag = "5";
         // 如果将新消息通知提醒托管给SDK完成，需要添加以下配置。
         initStatusBarNotificationConfig(context, options, activity);