 yonge
|
34c9d1d909
Merge branch 'yonge_master' into test
|
4 years ago |
 zouxuan
|
f60c79ead9
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
zouxuan
|
b15f1089c4
Merge branch 'master' of http://git.dayaedu.com/yonge/mec into test
|
4 years ago |
|
zouxuan
|
d276eed3b3
测试环境切换
|
4 years ago |
|
yonge
|
31cc8e5c4d
add:内容管理加分类
|
4 years ago |
 周箭河
|
838dc058a3
Merge branch 'master' into test
|
4 years ago |
|
周箭河
|
78309ad4d9
Merge branch 'maintenance_feature' into test
|
4 years ago |
|
zouxuan
|
9dbdad9dcd
Merge branch 'network_room' of http://git.dayaedu.com/yonge/mec into test
|
4 years ago |
|
zouxuan
|
d7c33587c0
网络教室伴奏
|
4 years ago |
|
zouxuan
|
93a95fde93
Merge branch 'network_room' of http://git.dayaedu.com/yonge/mec into test
|
4 years ago |
|
周箭河
|
54ca7f2de7
Merge branch 'maintenance_feature'
|
4 years ago |
|
周箭河
|
d9f9202bca
fix 退团学员修改手机号码，重新入团数据重复
|
4 years ago |
 Joburgess
|
a23c0d9d67
feat:vip课后台新增学员按照分部筛选
|
4 years ago |
|
zouxuan
|
fd3ffdf03a
Merge branch 'groupNickName' of http://git.dayaedu.com/yonge/mec into test
|
4 years ago |
|
zouxuan
|
7d7934737b
网络教室伴奏
|
4 years ago |
|
zouxuan
|
94ac4302b7
Merge branch 'network_room' of http://git.dayaedu.com/yonge/mec into test
|
4 years ago |
|
zouxuan
|
42023bdd8b
网络教室伴奏
|
4 years ago |
|
zouxuan
|
8cf1d0c2e0
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
zouxuan
|
6b97bdb32b
Merge branch 'network_room' of http://git.dayaedu.com/yonge/mec into test
|
4 years ago |
|
zouxuan
|
4d21a08d6c
网络教室伴奏
|
4 years ago |
|
Joburgess
|
1024003698
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
Joburgess
|
75f9e58072
feat:vip课课程数量限制排除乐理课
|
4 years ago |
|
zouxuan
|
c9fa491a49
Merge branch 'groupNickName' of http://git.dayaedu.com/yonge/mec
|
4 years ago |
|
zouxuan
|
061bd841bf
这里由原来的优先取老师的realName改成了优先取学员的username，因为管理员在修改通讯录备注的时候，如果是多角色，优先改的是学员的username
|
4 years ago |
|
zouxuan
|
7332925b8a
Merge branch 'groupNickName' of http://git.dayaedu.com/yonge/mec
|
4 years ago |
|
Joburgess
|
a8766001a2
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
Joburgess
|
e1877b658d
feat:乐团课作业推送
|
4 years ago |
|
yonge
|
70815005ad
Merge branch 'master' of http://git.dayaedu.com/yonge/mec
|
4 years ago |
|
yonge
|
cdc589af78
update:修改声部描述
|
4 years ago |
|
周箭河
|
4dd82ea184
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
