 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 |
|
zhai_lw
|
a4e4c862e0
|
检查C_Process
|
6 years ago |
|
zhai_lw
|
c63578ca78
|
检查C_Process
|
6 years ago |
 wan
|
bdbdab5947
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
|
wan
|
6ed473563d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
|
zhai_lw
|
2bd6e8c4c9
|
S_Servlet完成
|
6 years ago |
|
wan
|
d2b9c841e1
|
增加Process
|
6 years ago |
|
zhai_lw
|
db605ef91a
|
完善gdms，
完成用户流程
|
6 years ago |
|
zhai_lw
|
c6e5983cef
|
Merge remote-tracking branches 'remotes/origin/wlf', 'remotes/origin/wmj' and 'remotes/origin/zgl'
|
6 years ago |
 wlf
|
074cef61da
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
6 years ago |
|
wan
|
159041f5ee
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
a06b0d9ef8
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
 zgl
|
22c5002820
|
1、更新
|
6 years ago |
|
wlf
|
fcfd276d4a
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
 何楚
|
bd36c4a1f5
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
23a948d9e8
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
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 |
|
wan
|
36370116be
|
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
|
f9c7b6ed78
|
Merge remote-tracking branch 'remotes/origin/zgl'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# GDMS.iml
|
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'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
|
zhai_lw
|
d1bcd170f1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
8f599b3e18
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
1689e39545
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
wan
|
dfcd434b07
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
wan
|
3cbe7c42d8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
wan
|
6ae3efd617
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
zhai_lw
|
ff8bd763fa
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
zhai_lw
|
e8f865cc68
|
1，后端Operation逻辑调整
2，数据库访问逻辑调整
3，AccountManagement调整优化
4，完善功能4/6
|
6 years ago |
|
何楚
|
3b0ce6ab27
|
1, 选择界面
|
6 years ago |
|
wan
|
ac773da1d5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
曾国霖
|
ccb6d2ba96
|
3、新增删减
|
6 years ago |
|
何楚
|
b851efe5b8
|
1, 主页，前端基本框架
|
6 years ago |
|
曾国霖
|
04431d2b81
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
6 years ago |
|
曾国霖
|
e1122916b6
|
1，配置
|
6 years ago |
|
zhai_lw
|
531fb6ef83
|
1,登录后端
|
6 years ago |
|
wan
|
8e4fecf3cc
|
选题process
|
6 years ago |
|
zhai_lw
|
e5f76c397b
|
1, process 调整为3类
2，完善Exception
|
6 years ago |
|
何楚
|
d3ffde9a2e
|
1, 登陆注册页面
|
6 years ago |
|
zhai_lw
|
ca45a37fef
|
1, process 调整为3类
2，完善Exception
|
6 years ago |
|
何楚
|
23a90f350c
|
1, 登陆注册页面
|
6 years ago |
|
zhai_lw
|
e0b4bcf1cf
|
1, 调整
|
6 years ago |
|
zhai_lw
|
1caeaa2079
|
1, 设置tomcat服务器
2，配置数据库连接池
3，增加一类LastProcess
4，调整目录结构
5，其他
|
6 years ago |
|
zhai_lw
|
6d6b4121d5
|
first test
|
6 years ago |
