 zhai_lw
|
1473462317
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
zhai_lw
|
4e8235598f
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
zhai_lw
|
41b844f672
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
 何楚
|
f52e6bd7ef
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
zhai_lw
|
5c58652c51
|
tomcat升级
|
6 years ago |
|
何楚
|
236ef14371
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
zhai_lw
|
a4e4c862e0
|
检查C_Process
|
6 years ago |
|
zhai_lw
|
f273822c2e
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
|
何楚
|
2a13598b3e
|
前端完善
|
6 years ago |
|
何楚
|
50580a36bd
|
前端界面完善
|
6 years ago |
|
zhai_lw
|
0ac675d119
|
Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
|
6 years ago |
|
何楚
|
050de70087
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
何楚
|
f82ba25a31
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
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 |
 wlf
|
8fc30a753b
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
|
wlf
|
074cef61da
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
6 years ago |
 wan
|
a06b0d9ef8
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wlf
|
22f533255c
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
zhai_lw
|
b1c174822a
|
登陆注册前后端联通
|
6 years ago |
|
wlf
|
e0fde05f75
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
zhai_lw
|
7e9446d1f9
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
|
何楚
|
ac8875bcad
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
何楚
|
8ab7fc962e
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
wan
|
bc51aa29ff
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
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 |
|
何楚
|
9f6ebaf9fb
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
何楚
|
bd91d5b5b7
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
何楚
|
aa7d6ce390
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
c6330cb71c
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
wlf
|
881abc033a
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
何楚
|
3cf0f35521
|
1, 选择界面
|
6 years ago |
|
何楚
|
3b0ce6ab27
|
1, 选择界面
|
6 years ago |
|
何楚
|
08bf737f19
|
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'
# Conflicts:
# src/servlet/account/login.java
# web/WEB-INF/web.xml
# web/webPage/jsFile/login.js
|
6 years ago |
|
何楚
|
5503126da3
|
1, 主页，前端基本框架
|
6 years ago |
|
何楚
|
7c29e6c688
|
1, 主页，前端基本框架
|
6 years ago |
|
zhai_lw
|
e5f76c397b
|
1, process 调整为3类
2，完善Exception
|
6 years ago |
|
何楚
|
2973d5c48a
|
1, 登陆注册页面
|
6 years ago |
|
何楚
|
d3ffde9a2e
|
1, 登陆注册页面
|
6 years ago |
|
zhai_lw
|
3ca251506a
|
1, 调整
|
6 years ago |
|
zhai_lw
|
6ef9b61fba
|
1, 设置tomcat服务器
2，配置数据库连接池
3，增加一类LastProcess
4，调整目录结构
5，其他
|
6 years ago |
|
zhai_lw
|
ca45a37fef
|
1, process 调整为3类
2，完善Exception
|
6 years ago |
|
zhai_lw
|
b5f2321f76
|
Merge remote-tracking branch 'remotes/origin/hechu1'
配置文件修复
|
6 years ago |
|
zhai_lw
|
1e45ae1038
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
zhai_lw
|
76ae5cc87a
|
1, 调整
|
6 years ago |
|
何楚
|
990b1c1704
|
1, 登陆注册页面
|
6 years ago |
