- 28 Jun, 2020 1 commit
- 
- 
严久程 committed
 
- 
- 18 Jun, 2020 1 commit
- 
- 
严久程 committed
 
- 
- 10 Jun, 2020 1 commit
- 
- 
严久程 committed
 
- 
- 09 Jun, 2020 4 commits
- 
- 
Merge branch 'feature/改bug_5_26' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/改bug_5_26 严久程 committed
- 
严久程 committed
- 
Merge branch 'feature/改bug_5_26' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/改bug_5_26 严久程 committed
- 
严久程 committed
 
- 
- 03 Jun, 2020 2 commits
- 
- 
Merge branch 'feature/改bug_5_26' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/改bug_5_26 ydl committed
- 
ydl committed
 
- 
- 27 May, 2020 1 commit
- 
- 
严久程 committed
 
- 
- 26 May, 2020 2 commits
- 25 May, 2020 1 commit
- 
- 
ydl committed
 
- 
- 23 May, 2020 1 commit
- 
- 
# Conflicts: # config.gradle ydl committed
 
- 
- 21 May, 2020 3 commits
- 20 May, 2020 4 commits
- 19 May, 2020 5 commits
- 
- 
ydl committed
- 
# Conflicts: # config.gradle # m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt # m-home/src/xlzx/res/layout/home_button_banner_view.xml # m-home/src/xlzx/res/layout/home_fragment_home_module.xml # m-home/src/xlzx/res/layout/home_test_item_view.xml ydl committed
- 
ydl committed
- 
# Conflicts: # config.gradle # m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt # m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt # m-confide/src/main/java/com/ydl/confide/home/bean/ConfideConnectResponse.kt # m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt # m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt 严久程 committed
- 
严久程 committed
 
- 
- 18 May, 2020 12 commits
- 
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化 严久程 committed
- 
严久程 committed
- 
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化 严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
 
- 
- 16 May, 2020 1 commit
- 
- 
ydl committed
 
- 
- 15 May, 2020 1 commit
- 
- 
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化 Conflicts: config.gradle 严久程 committed
 
- 
