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

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.59.40",
             "m-fm"            : "0.0.30.00",
-            "m-user"          : "0.0.60.53",
+            "m-user"          : "0.0.60.54",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.18.30",
             "m-dynamic"       : "0.0.7.13",
@@ -91,7 +91,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.51.16",
             "m-fm"            : "0.0.23.5",
-            "m-user"          : "0.0.60.53",
+            "m-user"          : "0.0.60.54",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.3.15",
             "m-dynamic"       : "0.0.1.7",

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -170,7 +170,8 @@ class VerificationCodeActivity :
             val sb = StringBuffer(userPhoneNumber)
             sb.insert(3, " ")
             sb.insert(8, " ")
-            tv_phone.text = "已发送至 +"+sb.toString()
+            val splitCountryCode=countryCode?.substring(2)
+            tv_phone.text = "已发送至 +${splitCountryCode}  $sb"
         } else {
             tv_phone.text = userPhoneNumber
         }