 zhai_lw
|
edbfb5aaba
|
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
|
7 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
|
7 years ago |
|
zhai_lw
|
e9a34cee95
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# src/core/process/C_CollegeFillScoreOpinion.java
# src/core/process/C_MentorFillOpeningReportOpinion.java
# src/core/process/C_MentorFillReview.java
# src/core/process/C_ReviewerFillReview.java
# src/core/process/C_SchoolFillScoreOpinion.java
# src/core/process/C_SecretaryFillOpeningReportRecord.java
# src/core/process/C_SecretaryFillReplyRecord.java
# src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
# src/core/process/C_TeacherTeamFillScoreOpinion.java
|
7 years ago |
|
zhai_lw
|
e2102ef75a
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# src/core/process/C_CollegeFillScoreOpinion.java
# src/core/process/C_MentorFillOpeningReportOpinion.java
# src/core/process/C_MentorFillReview.java
# src/core/process/C_ReviewerFillReview.java
# src/core/process/C_SchoolFillScoreOpinion.java
# src/core/process/C_SecretaryFillOpeningReportRecord.java
# src/core/process/C_SecretaryFillReplyRecord.java
# src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
# src/core/process/C_TeacherTeamFillScoreOpinion.java
|
7 years ago |
|
zhai_lw
|
147864a878
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
|
7 years ago |
 wan
|
05f3b310f5
|
process
|
7 years ago |
|
zhai_lw
|
2678bcb567
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
|
7 years ago |
|
wan
|
60ab426c64
|
process
|
7 years ago |
|
zhai_lw
|
5bde4d13ca
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
7 years ago |
|
wan
|
55b9699b1c
|
process
|
7 years ago |
|
zhai_lw
|
5b403d16b6
|
重构
|
7 years ago |
|
zhai_lw
|
a9e3908c6f
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
7 years ago |
 何楚
|
139d16b702
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/GDMS.java
|
7 years ago |
|
zhai_lw
|
511e8cf0b2
|
GDMS init finished
|
7 years ago |
|
wan
|
dfa880940e
|
process
|
7 years ago |
|
何楚
|
d580b21f4c
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/GDMS.java
|
7 years ago |
|
何楚
|
db0eb6f49f
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
7 years ago |
|
zhai_lw
|
e4acad3a6d
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
7 years ago |
|
何楚
|
a9c426ee6f
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
7 years ago |
|
wan
|
b20d8b00ca
|
无
|
7 years ago |
|
wan
|
738294004c
|
无
|
7 years ago |
|
wan
|
37682f9bc1
|
无
|
7 years ago |
|
zhai_lw
|
20058dd88f
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
7 years ago |
|
zhai_lw
|
255db387e1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
7 years ago |
|
zhai_lw
|
049984695c
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/artifacts/gdms_Web_exploded.xml
# .idea/modules.xml
# GDMS.iml
|
7 years ago |
|
zhai_lw
|
a1c83ce362
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
7 years ago |
|
zhai_lw
|
db70f94ce2
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
7 years ago |
|
zhai_lw
|
a39e20d3db
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
7 years ago |
|
何楚
|
574638756c
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
7 years ago |
|
wan
|
1dfcd61fac
|
日期格式化
|
7 years ago |
|
zhai_lw
|
4a41175a0d
|
rewrite Process
|
7 years ago |
|
wan
|
c382405994
|
日期格式化
|
7 years ago |
|
wan
|
057abc2477
|
增加process
|
7 years ago |
|
wan
|
0bbdd94575
|
增加process
|
7 years ago |
|
wan
|
113890c5f6
|
补充Service
|
7 years ago |
|
wan
|
cfaef556d3
|
补充Service
|
7 years ago |
|
何楚
|
e744f97b8c
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
7 years ago |
|
zhai_lw
|
e2b0fcc128
|
rewrite Process
|
7 years ago |
|
何楚
|
e26d6cd914
|
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
|
7 years ago |
|
何楚
|
38b8f68d67
|
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
|
7 years ago |
|
何楚
|
2522730dad
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
7 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
|
7 years ago |
|
zhai_lw
|
78666e3a41
|
rewrite Process
|
7 years ago |
|
何楚
|
211b4b69ec
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
7 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
|
7 years ago |
|
zhai_lw
|
ed7bcee5b9
|
debug condition
|
7 years ago |
|
zhai_lw
|
3976d3677e
|
Merge remote-tracking branch 'remotes/origin/wmj'
|
7 years ago |
|
何楚
|
a010ba8f45
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
7 years ago |
|
zhai_lw
|
49bcc9b319
|
debug condition
|
7 years ago |
|
何楚
|
861f142ead
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
7 years ago |
