 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 |
 何楚
|
574638756c
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
6 years ago |
|
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 |
|
何楚
|
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
|
a4e4c862e0
|
检查C_Process
|
6 years ago |
|
zhai_lw
|
0ac675d119
|
Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
|
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 |
|
何楚
|
9f6ebaf9fb
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
