 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
|
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
|
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
|
5bde4d13ca
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
6 years ago |
|
wan
|
55b9699b1c
|
process
|
6 years ago |
|
zhai_lw
|
5b403d16b6
|
重构
|
6 years ago |
|
zhai_lw
|
a9e3908c6f
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
|
zhai_lw
|
511e8cf0b2
|
GDMS init finished
|
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
|
b20d8b00ca
|
无
|
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
|
049984695c
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/artifacts/gdms_Web_exploded.xml
# .idea/modules.xml
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
a1c83ce362
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
db70f94ce2
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
a39e20d3db
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
何楚
|
574638756c
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
6 years ago |
|
wan
|
1dfcd61fac
|
日期格式化
|
6 years ago |
|
zhai_lw
|
4a41175a0d
|
rewrite Process
|
6 years ago |
|
wan
|
057abc2477
|
增加process
|
6 years ago |
|
wan
|
0bbdd94575
|
增加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 |
|
何楚
|
211b4b69ec
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
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
|
49bcc9b319
|
debug condition
|
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 |
|
zhai_lw
|
7e3bad15ea
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# src/core/process/C_CollegeFillScoreOpinion.java
# src/core/process/C_MentorFillOpeningReportOpinion.java
# src/core/process/ProcessManagement.java
|
6 years ago |
|
zhai_lw
|
ce9ae99567
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
db1069d7c1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
56771ceabd
|
Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
|
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
|
ea7a6c6537
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zgl
|
0a4e6e35ed
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
6 years ago |
|
zhai_lw
|
a0c88902e5
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zgl
|
0cdb2e654c
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
6 years ago |
|
zhai_lw
|
00e57a490b
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
cf422038a2
|
Merge remote-tracking branch 'remotes/origin/zgl' into wmj
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
|
zgl
|
e291f3dfd1
|
Merge remote-tracking branch 'remotes/origin/wmj' into zgl
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
|
6 years ago |
|
zgl
|
36d73d4096
|
Merge remote-tracking branch 'remotes/origin/wmj' into zgl
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
6 years ago |
|
wan
|
4fe5018fe4
|
增加iconurl
|
6 years ago |
|
wan
|
adbb0795d8
|
增加iconurl
|
6 years ago |
|
zhai_lw
|
9433c8ad1a
|
Merge remote-tracking branches 'remotes/origin/wmj' and 'remotes/origin/zgl'
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
6 years ago |
