app/src/main/res/layout · 62e21a4b371990c360e8424572839efddbd2d340 · 杨凯 / YDL-Component-Medical

Merge branch 'feature/consultant_update' into feature/v3 · 79079b9e

# 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 Dec 19, 2019

79079b9e

Name	Last commit	Last update
..
activity_fragment_container.xml		Loading commit data...
activity_home.xml		Loading commit data...
activity_main.xml		Loading commit data...
fragment_play.xml		Loading commit data...
include_play_page_controller.xml		Loading commit data...