 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
|
dfe470d1a3
|
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
|
5bde4d13ca
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
6 years ago |
|
zhai_lw
|
5b403d16b6
|
重构
|
6 years ago |
 wan
|
dfa880940e
|
process
|
6 years ago |
 何楚
|
a9c426ee6f
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
6 years ago |
|
wan
|
b20d8b00ca
|
无
|
6 years ago |
|
wan
|
37682f9bc1
|
无
|
6 years ago |
|
zhai_lw
|
a39e20d3db
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
4a41175a0d
|
rewrite Process
|
6 years ago |
|
wan
|
cfaef556d3
|
补充Service
|
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 |
|
zhai_lw
|
db605ef91a
|
完善gdms，
完成用户流程
|
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
|
d1bcd170f1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
