121 Commits (6aee5b693ac4c74f3f3076157c6c08deacb4ae2e)

Author SHA1 Message Date
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
wan 6ae3efd617 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
wlf 881abc033a Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf 86fbf1db1b Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
zhai_lw 36fb645981 Merge remote-tracking branch 'remotes/origin/hechu1'
6 years ago
wlf 62759d6b34 Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf ad054fde4b Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf 1f5b0b6f7a Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf dcb917329b Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
6 years ago
wlf 1d70584bf1 Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wan 97f6d812b3 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
wlf 8db98cedfb Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf 48962fa88c Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
zhai_lw e58825d4ff 1,后端Operation逻辑调整
6 years ago
wlf 118c44c22b Merge remote-tracking branch 'remotes/origin/master' into wlf
6 years ago
wlf 4318035a8f 2、更新
6 years ago
wlf cb923f9729 1、更新
6 years ago
wan 776ed667b8 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
wan f118828854 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
wan dbc64deef5 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
zhai_lw 8eb298d93c 1,后端Operation逻辑调整
6 years ago
wan ac773da1d5 Merge remote-tracking branch 'remotes/origin/master' into wmj
6 years ago
zhai_lw 3637f7c000 1,后端process逻辑调整
6 years ago
zhai_lw 01f4409f14 1,后端功能2/5
6 years ago
zhai_lw 615933c50a 1,后端注册完善
6 years ago
zhai_lw c8746f9e72 1,后端注册完成
6 years ago
zhai_lw 04a929c714 1,登录前端和后端对接
6 years ago
zhai_lw 90d6124e61 Merge remote-tracking branch 'remotes/origin/hechu1'
6 years ago
zhai_lw 41a590d63a Merge remote-tracking branch 'remotes/origin/hechu1'
6 years ago
何楚 5503126da3 1, 主页,前端基本框架
6 years ago
zhai_lw 531fb6ef83 1,登录后端
6 years ago
何楚 7c29e6c688 1, 主页,前端基本框架
6 years ago
wan 8e4fecf3cc 选题process
6 years ago
zhai_lw e5f76c397b 1, process 调整为3类
6 years ago
何楚 2973d5c48a 1, 登陆注册页面
6 years ago
zhai_lw 3ca251506a 1, 调整
6 years ago
zhai_lw fd6c9b7c93 1, 设置tomcat服务器
6 years ago
zhai_lw 6ef9b61fba 1, 设置tomcat服务器
6 years ago
zhai_lw ca45a37fef 1, process 调整为3类
6 years ago
zhai_lw b5f2321f76 Merge remote-tracking branch 'remotes/origin/hechu1'
6 years ago
zhai_lw 76ae5cc87a 1, 调整
6 years ago
何楚 990b1c1704 1, 登陆注册页面
6 years ago
zhai_lw 3f52144d43 1, 设置tomcat服务器
6 years ago
zhai_lw 1caeaa2079 1, 设置tomcat服务器
6 years ago
zhai_lw a0ddf99418 1, 添加gdms.Mode以方便后期调试
6 years ago
zhai_lw e21fc49ae3 1, 添加void setOperations(String options)
6 years ago
zhai_lw 4d62390572 1,提交需求报告
6 years ago
zhai_lw 6d6b4121d5 first test
6 years ago