97 Commits (1c945a05d7634de798518a6a8a84f0a4829a6591)

Author SHA1 Message Date
wlf 1c945a05d7 Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf 42369e5b49 Merge remote-tracking branch 'remotes/origin/wmj' into wlf
6 years ago
zhai_lw 29de469afd 完成teacherSearchStudent
6 years ago
zhai_lw 57893051b8 完成teacherSearchStudent
6 years ago
zhai_lw c6e5983cef Merge remote-tracking branches 'remotes/origin/wlf', 'remotes/origin/wmj' and 'remotes/origin/zgl'
6 years ago
zhai_lw 0dff0df466 完善gdms,
6 years ago
zgl 4c8b5c52f8 1、完成学生和老师status表,完善数据库
6 years ago
wan 96258f81e0 Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
6 years ago
wlf 82eac83462 Merge remote-tracking branch 'remotes/origin/wmj' into wlf
6 years ago
wan 7ef6908720 Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
6 years ago
wlf 8fc30a753b Merge remote-tracking branch 'remotes/origin/wmj' into wlf
6 years ago
wan c6e2ca10fb Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
6 years ago
wan 06841d30db Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
6 years ago
wlf 96b6fc23b4 Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf 074cef61da Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wan 159041f5ee Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
6 years ago
wan a06b0d9ef8 Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
6 years ago
wlf 22f533255c Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
zhai_lw 51b73e3813 onlineCheck
6 years ago
zhai_lw b1c174822a 登陆注册前后端联通
6 years ago
wlf e0fde05f75 Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
zhai_lw fe2b89a5fd 调整
6 years ago
zhai_lw 7420a3362a 调整
6 years ago
zhai_lw f753c9a1f4 合并所有分支,查找合并错误
6 years ago
wlf 53e7a50fa1 Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wlf 23a948d9e8 Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wan 36370116be Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
zhai_lw 643b2cfe56 合并所有分支,查找合并错误
6 years ago
zhai_lw 3c1d9b6906 Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
6 years ago
zhai_lw 4127803c61 Merge remote-tracking branch 'remotes/origin/wmj'
6 years ago
zhai_lw 7c09829e78 Process调整
6 years ago
wlf c4e5462dfc Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wlf 759e95877f Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wan 7e7a4a96bb Merge remote-tracking branch 'remotes/origin/wlf' into wmj
6 years ago
zhai_lw 8f599b3e18 Merge remote-tracking branch 'remotes/origin/hechu1'
6 years ago
wlf b146837ead Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wlf 8391705ddb Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wan cebf16350e Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj
6 years ago
wlf 2c38b26553 Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wlf 1689e39545 Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wan f06566839c Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj
6 years ago
wlf d0164dc956 Merge remote-tracking branch 'remotes/origin/wmj' into wlf
6 years ago
wlf c6330cb71c Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wlf 3a84126bc2 Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wlf 768b97c4da Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wan b6f6e5c73b Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
wan dfcd434b07 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
zhai_lw fffef13eb9 1,调整
6 years ago
wan 3cbe7c42d8 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
wan 0e8a2a1ebb Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago