 zhai_lw
|
4144ed000d
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_MentorFillReview.java
# src/core/process/C_ReviewerFillReview.java
|
6 years ago |
|
zhai_lw
|
193a8ba91c
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_MentorFillReview.java
# src/core/process/C_ReviewerFillReview.java
|
6 years ago |
|
zhai_lw
|
0d4b7338bb
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/libraries/com_hynnet_json_lib_2_4.xml
# GDMS.iml
|
6 years ago |
 wan
|
05f3b310f5
|
process
|
6 years ago |
|
zhai_lw
|
5b403d16b6
|
重构
|
6 years ago |
|
wan
|
dfa880940e
|
process
|
6 years ago |
 何楚
|
db0eb6f49f
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
6 years ago |
|
何楚
|
a9c426ee6f
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
6 years ago |
|
wan
|
37682f9bc1
|
无
|
6 years ago |
|
zhai_lw
|
20058dd88f
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
255db387e1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
db70f94ce2
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
1dfcd61fac
|
日期格式化
|
6 years ago |
|
wan
|
057abc2477
|
增加process
|
6 years ago |
|
wan
|
cfaef556d3
|
补充Service
|
6 years ago |
|
何楚
|
4a2ef0ab6d
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/artifacts/gdms_Web_exploded.xml
# .idea/artifacts/gdms_war_exploded.xml
# .idea/misc.xml
|
6 years ago |
|
何楚
|
8f2eb869a2
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/artifacts/gdms_Web_exploded.xml
# .idea/artifacts/gdms_war_exploded.xml
# .idea/misc.xml
|
6 years ago |
|
何楚
|
a010ba8f45
|
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
|
ad7086f650
|
Merge remote-tracking branch 'remotes/origin/zgl'
# Conflicts:
# .idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
# src/dao/DBManagement.java
|
6 years ago |
|
zhai_lw
|
e9927b49f5
|
Merge remote-tracking branch 'remotes/origin/zgl'
# Conflicts:
# .idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
# src/dao/DBManagement.java
|
6 years ago |
 zgl
|
98b8eb8987
|
Merge remote-tracking branch 'remotes/origin/wmj' into zgl
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
|
6 years ago |
|
zhai_lw
|
a0c88902e5
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
00e57a490b
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
e7ff9864bb
|
修改完的process
|
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 |
|
wan
|
bdbdab5947
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_StudentUploadOpeningReport.java
|
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 |
|
zhai_lw
|
3c1d9b6906
|
Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
|
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 |
|
zhai_lw
|
1caeaa2079
|
1, 设置tomcat服务器
2，配置数据库连接池
3，增加一类LastProcess
4，调整目录结构
5，其他
|
6 years ago |
|
zhai_lw
|
6d6b4121d5
|
first test
|
6 years ago |
