 zouxuan
|
cb110f33d2
Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live
|
2 gadi atpakaļ |
|
zouxuan
|
adf97e2888
update
|
2 gadi atpakaļ |
 yuanliang
|
654bedeec8
1.共享功能调整
|
2 gadi atpakaļ |
 shangke
|
4350eb8ba1
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
shangke
|
06f7fd6cbd
fix
|
2 gadi atpakaļ |
|
zouxuan
|
b70665ac51
Merge remote-tracking branch 'origin/master_saas' into master_saas
|
2 gadi atpakaļ |
|
zouxuan
|
689adfb462
update
|
2 gadi atpakaļ |
 liujc
|
5b15bc1715
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
liujc
|
f2be53c2d1
Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into feature/0529-live
|
2 gadi atpakaļ |
|
liujc
|
5af9dad015
fix
|
2 gadi atpakaļ |
|
zouxuan
|
47e2687a2a
Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas
|
2 gadi atpakaļ |
|
zouxuan
|
5aef181236
Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live
|
2 gadi atpakaļ |
|
zouxuan
|
5dcd6824a0
update
|
2 gadi atpakaļ |
|
liujc
|
6bfba3d750
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
liujc
|
8ae6fce74b
直播老师取课程老师
|
2 gadi atpakaļ |
|
liujc
|
f0763cfa1b
Revert "直播间老师"
|
2 gadi atpakaļ |
|
liujc
|
941dc76a67
直播间老师
|
2 gadi atpakaļ |
|
liujc
|
a7ce37e487
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
liujc
|
fff80ef6fa
修改老师加入群聊
|
2 gadi atpakaļ |
|
liujc
|
eee815be2b
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
liujc
|
783bb9274c
merge
|
2 gadi atpakaļ |
|
liujc
|
eb4db87d43
修改发消息时间
|
2 gadi atpakaļ |
|
shangke
|
ba85d2861e
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
shangke
|
fc396681fc
Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live
|
2 gadi atpakaļ |
|
shangke
|
96c32f1d83
fix连堂课计时
|
2 gadi atpakaļ |
|
liujc
|
5f65e5e9b3
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
liujc
|
ee492fec68
直播间列表去除直播课
|
2 gadi atpakaļ |
|
liujc
|
abc74b862e
迟到人数
|
2 gadi atpakaļ |
|
liujc
|
62b1e0a47e
Merge branch 'feature/0529-live' into master_saas
|
2 gadi atpakaļ |
|
liujc
|
e57df30f0c
fix
|
2 gadi atpakaļ |
