 Joburgess
|
05e693a476
Merge remote-tracking branch 'origin/master'
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
176b5ee3e0
Merge branch 'vip_double_11'
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
741bb5073f
Merge remote-tracking branch 'origin/vip_double_11' into vip_double_11
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
28f5f0571f
update
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
9206ad9e64
feat:双十一学员去除分部，之和指导教师挂钩
|
%!s(int64=5) %!d(string=hai) anos |
 yonge
|
0c27c8b1bf
Merge branch 'online1'
|
%!s(int64=5) %!d(string=hai) anos |
|
yonge
|
e2ff372e6e
Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into online1
|
%!s(int64=5) %!d(string=hai) anos |
|
yonge
|
83f539e29f
add
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
01e551d5cc
Merge remote-tracking branch 'origin/online1' into online1
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
a06fa1e04e
fix:1、教师端点名列表声部显示错误；2、课程冲突检测中主教助教未进行冲突检测
|
%!s(int64=5) %!d(string=hai) anos |
 zouxuan
|
95ad479df9
Merge branch 'master' of http://git.dayaedu.com/yonge/mec
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
20e8b58674
Merge branch 'online_music_library' of http://git.dayaedu.com/yonge/mec
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
eb5e9a5152
网络教室曲库
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
5dd8184e4b
Merge remote-tracking branch 'origin/master'
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
d196f1ad10
update
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
b98aeafd4d
Merge branch 'online-2020-11-23' of http://git.dayaedu.com/yonge/mec
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
ddf49a8a45
update
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
350d7dc476
Merge remote-tracking branch 'origin/master'
|
%!s(int64=5) %!d(string=hai) anos |
|
yonge
|
200b46247d
bugfix:订单导出增加收款账户
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
2b36575d7a
update
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
984e49893c
Merge branch 'online_music_library' of http://git.dayaedu.com/yonge/mec
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
5780d2c204
Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into online_music_library
|
%!s(int64=5) %!d(string=hai) anos |
|
zouxuan
|
2b97916948
网络教室曲库
|
%!s(int64=5) %!d(string=hai) anos |
|
yonge
|
5514e39c6f
Merge branch 'online1'
|
%!s(int64=5) %!d(string=hai) anos |
|
yonge
|
220f5733b0
update
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
79e83959fb
Merge remote-tracking branch 'origin/master'
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
58ffbcb16a
Merge branch 'vip_double_11'
|
%!s(int64=5) %!d(string=hai) anos |
|
Joburgess
|
f2507370ee
feat：vip课双11活动
|
%!s(int64=5) %!d(string=hai) anos |
|
yonge
|
25aaa9fdcb
Merge branch 'online1'
|
%!s(int64=5) %!d(string=hai) anos |
|
yonge
|
67e07eed05
update
|
%!s(int64=5) %!d(string=hai) anos |
