- 20 Dec, 2019 7 commits
- 19 Dec, 2019 10 commits
- 
- 
# Conflicts: # app/src/main/java/com/ydl/component/MainActivity.kt # app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java # config.gradle # m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt # m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt # m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt # m-user/src/main/java/com/yidianling/user/ui/login/presenter/LoginPresenterImpl.kt # m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt konghaorui committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 严久程 committed
- 
严久程 committed
- 
# Conflicts: # app/build.gradle # app/src/main/java/com/ydl/component/MainActivity.kt # config.gradle # m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt 徐健 committed
- 
徐健 committed
- 
徐健 committed
- 
徐健 committed
- 
konghaorui committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 konghaorui committed
- 
konghaorui committed
 
- 
- 18 Dec, 2019 18 commits
- 
- 
徐健 committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 严久程 committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 徐健 committed
- 
徐健 committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 严久程 committed
- 
严久程 committed
- 
konghaorui committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 konghaorui committed
- 
konghaorui committed
- 
严久程 committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 konghaorui committed
- 
konghaorui committed
- 
徐健 committed
- 
徐健 committed
- 
徐健 committed
- 
konghaorui committed
- 
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3 # Conflicts: # m-home/src/xlzx/java/com/yidianling/home/presenter/HomePresenterImpl.kt konghaorui committed
- 
konghaorui committed
 
- 
- 17 Dec, 2019 5 commits
- 
- 
konghaorui committed
- 
徐健 committed
- 
徐健 committed
- 
徐健 committed
- 
徐健 committed
 
- 
