Commit Graph

133 Commits

Author SHA1 Message Date
李汉正 4ce4826ecf 修改 2017-01-07 04:59:45 +00:00
李汉正 e81988357f 我们一块做的 2017-01-06 19:42:33 +00:00
stormand ac756d2ae6 Merge pull request #11 from YXX778526573/master
输入成绩验证
2017-01-05 20:46:40 +08:00
stormand 3782327fa7 Merge branch 'master' into master 2017-01-05 20:46:31 +08:00
stormand 74fd2b4002 Merge branch 'dw_test' into master 2017-01-05 20:44:10 +08:00
YXX 9bb793b185 输入成绩验证 2017-01-05 12:30:54 +00:00
stormand badfeaab1c t 2017-01-05 18:43:22 +08:00
stormand 84b4d1718e t 2017-01-05 18:40:37 +08:00
stormand 4f175c8f10 t 2017-01-05 18:27:44 +08:00
stormand 0e5233af7a t 2017-01-05 18:27:05 +08:00
stormand f084222c9f t 2017-01-05 18:23:44 +08:00
stormand 51c3add19b t 2017-01-05 18:16:27 +08:00
stormand 5989631368 t 2017-01-05 18:12:47 +08:00
stormand 68c7868e1d t 2017-01-05 18:07:07 +08:00
stormand a1b2802153 t 2017-01-05 17:55:02 +08:00
stormand 05e47eb286 t 2017-01-05 17:44:04 +08:00
stormand 2bca06237f t 2017-01-05 17:37:10 +08:00
stormand 2634ee963e t 2017-01-05 17:36:49 +08:00
stormand 0d93267327 t 2017-01-05 17:04:10 +08:00
stormand a6fc33f50f t 2017-01-05 16:59:27 +08:00
stormand 71aa195bf0 t 2017-01-05 16:57:06 +08:00
stormand 23b4993d38 t 2017-01-05 16:55:08 +08:00
stormand 14a9b23b75 t 2017-01-05 16:53:39 +08:00
stormand d562a701f9 t 2017-01-05 16:51:53 +08:00
stormand fe4b834b96 t 2017-01-05 16:46:03 +08:00
stormand 6b8e2e293f 数据验证 2017-01-05 16:31:42 +08:00
stormand 0102960e82 数据验证 2017-01-05 16:26:12 +08:00
stormand afc4af4ec1 change some routes bug 2017-01-04 13:44:53 +08:00
stormand 3e57389f1e t 2017-01-04 13:39:37 +08:00
stormand fab4d754d9 Merge pull request #9 from Rwei2016coding/master
文件导入导出
2017-01-04 13:24:40 +08:00
stormand 8861da5687 Merge branch 'master' into master 2017-01-04 13:24:28 +08:00
Rwei2016coding eac2fb6bd1 文件导入导出 2017-01-04 13:06:39 +08:00
Rwei2016coding c04abd6ff7 文件导入导出 2017-01-04 13:03:09 +08:00
stormand 8bc7863e5c Merge pull request #8 from flyingwaters/master
课程表
2017-01-04 01:05:09 +08:00
stormand ecaaf1e5b4 Merge branch 'master' into master 2017-01-04 01:04:31 +08:00
feng longyu 109231fe3b 课程表 2017-01-03 17:00:21 +00:00
stormand 4974e451b6 搜索下拉优化 2017-01-02 22:24:48 +08:00
stormand 9d1866305a Merge remote-tracking branch 'origin/dev' 2017-01-02 16:21:56 +08:00
stormand 94dfaeeb5a Merge pull request #7 from YXX778526573/master
添加课程页面规范化
2017-01-02 16:13:22 +08:00
stormand ed26b41005 Merge branch 'master' into master 2017-01-02 16:12:11 +08:00
YXX 099c7e63b7 添加课程页面规范化 2016-12-31 05:35:08 +00:00
stormand 43640f3573 Merge pull request #6 from flyingwaters/master
选课冲突--fenglongyu
2016-12-10 03:11:54 -06:00
stormand 4f81cefb40 Merge branch 'dev' into master 2016-12-10 03:11:31 -06:00
feng longyu c1da723e3e 选课冲突 2016-12-10 08:17:57 +00:00
stormand 8af199c659 t 2016-12-07 23:31:11 +08:00
stormand 296e5d9fea t 2016-12-07 23:29:28 +08:00
stormand 7d2078266d Merge branch 'dev'
# Conflicts:
#	.idea/workspace.xml
2016-12-07 22:09:14 +08:00
stormand b2de705b5d t 2016-12-07 22:07:49 +08:00
stormand 9158204087 t 2016-12-07 22:07:14 +08:00
stormand a1e5cf7a63 merge 2016-12-07 22:06:14 +08:00