m-user/src/main · 8e48166508f8c4fbf8afce08ca8dd3ae08cd069d · 杨凯 / YDL-Component-Medical

Merge remote-tracking branch 'origin/4.1.63修改心理咨询马甲包微信qq也要勾选协议' into 4.1.69(强绑手机号) · 8e481665

# 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
#	m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt

committed Mar 05, 2021

8e481665

Name	Last commit	Last update
..
assets/html		Loading commit data...
gen/com/yidianling/user		Loading commit data...
java/com/yidianling/user		Loading commit data...
modular_api/com/yidianling/user/api		Loading commit data...
res		Loading commit data...
AndroidManifest.xml		Loading commit data...