 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
|
55a1d718f1
|
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 |
|
zhai_lw
|
ea7a6c6537
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
a0c88902e5
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
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 |
|
zhai_lw
|
6aee5b693a
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
 wan
|
1b127f1c80
|
process命名
|
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 |
 zgl
|
d82601a028
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/dataSources.xml
# .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml
# .idea/libraries/tomcat_lib.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
|
zgl
|
721076b14b
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/dataSources.xml
# .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml
# .idea/libraries/tomcat_lib.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
|
wan
|
e7ff9864bb
|
修改完的process
|
6 years ago |
|
zhai_lw
|
4e8235598f
|
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
|
5c58652c51
|
tomcat升级
|
6 years ago |
|
wan
|
e91f928854
|
修改完的process
|
6 years ago |
|
wan
|
2268a18d58
|
修改process
|
6 years ago |
|
wan
|
43ee705f49
|
修改process
|
6 years ago |
 wlf
|
140cf87adf
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
|
6 years ago |
|
wlf
|
1ca68a9b9b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
|
6 years ago |
|
zgl
|
c5eb8b35d2
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
6 years ago |
|
zgl
|
c4bd04793a
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# src/servlet/S_CollegeFillOpeningReportOpinion.java
# src/servlet/S_CollegeFillScoreOpinion.java
# src/servlet/S_MentorFillOpeningReportOpinion.java
# src/servlet/S_MentorFillReview.java
# src/servlet/S_ReviewerFillReview.java
# src/servlet/S_SchoolFillScoreOpinion.java
# src/servlet/S_SecretaryFillOpeningReportRecord.java
# src/servlet/S_TeacherTeamFillScoreOpinion.java
|
6 years ago |
|
zhai_lw
|
a4e4c862e0
|
检查C_Process
|
6 years ago |
|
zgl
|
7a74e1e5ad
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# src/gdms/GlobalTimePoint.json
|
6 years ago |
|
wan
|
c660b8c1cb
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# src/servlet/S_StudentUploadOpeningReport.java
|
6 years ago |
|
wlf
|
5716a978e8
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
|
zhai_lw
|
c63578ca78
|
检查C_Process
|
6 years ago |
|
wan
|
061437836c
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
wan
|
f5a8a777a3
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# src/servlet/S_StudentUploadOpeningReport.java
|
6 years ago |
|
zhai_lw
|
a02f896fc4
|
检查C_Process
|
6 years ago |
|
zhai_lw
|
1041dcc64f
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
wan
|
9b3adc14d5
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# src/servlet/S_StudentUploadOpeningReport.java
|
6 years ago |
|
zhai_lw
|
49e397a08a
|
S_Servlet完成
|
6 years ago |
|
wan
|
6ed473563d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
|
wan
|
ad2cb3d81f
|
增加Process
|
6 years ago |
|
zhai_lw
|
8a5678029c
|
S_Servlet完成
|
6 years ago |
|
wlf
|
b3317a2850
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
|
zgl
|
7158dd0bef
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
6 years ago |
|
zhai_lw
|
2bd6e8c4c9
|
S_Servlet完成
|
6 years ago |
|
zgl
|
b5ceb5b419
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# src/gdms/GlobalTimePoint.json
|
6 years ago |
|
zgl
|
2b37cb7b39
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# src/gdms/GlobalTimePoint.json
|
6 years ago |
|
zgl
|
d8df3a3f81
|
1、global_time_point填写
|
6 years ago |
|
zhai_lw
|
331e9cbf34
|
S_Servlet完成
|
6 years ago |
|
wlf
|
bf600c8715
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
|
6 years ago |
|
wan
|
d2b9c841e1
|
增加Process
|
6 years ago |
|
zhai_lw
|
b8af9db37a
|
globalTimePoint
|
6 years ago |
|
zhai_lw
|
3082be0648
|
globalTimePoint
|
6 years ago |
|
zhai_lw
|
8fa448c6c8
|
Merge remote-tracking branch 'remotes/origin/zgl'
|
6 years ago |
|
zhai_lw
|
6a2ba9bc6f
|
完成teacherSearchStudent
|
6 years ago |
