-
Merge remote-tracking branch 'origin/多端登录不互踢new' into 4.1.69(强绑手机号) · ffae3e1a
# Conflicts: # config.gradle # m-user/src/main/AndroidManifest.xml # m-user/src/main/java/com/yidianling/user/http/UserApi.kt # m-user/src/main/java/com/yidianling/user/mine/AccountSettingActivity.java
YKai committed