 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 |
|
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 |
|
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 |
 何楚
|
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 |
|
何楚
|
a1a3f84473
|
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 |
|
何楚
|
04c02fe5ad
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
何楚
|
236ef14371
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
zhai_lw
|
a4e4c862e0
|
检查C_Process
|
6 years ago |
|
zhai_lw
|
f273822c2e
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
|
zhai_lw
|
c63578ca78
|
检查C_Process
|
6 years ago |
|
何楚
|
2a13598b3e
|
前端完善
|
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
|
bdbdab5947
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_StudentUploadOpeningReport.java
|
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 |
|
何楚
|
50580a36bd
|
前端界面完善
|
6 years ago |
|
zhai_lw
|
2bd6e8c4c9
|
S_Servlet完成
|
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 |
|
wlf
|
687ce0df5b
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
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
|
0ac675d119
|
Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
|
6 years ago |
|
zhai_lw
|
6a2ba9bc6f
|
完成teacherSearchStudent
|
6 years ago |
|
何楚
|
050de70087
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
1c945a05d7
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
|
6 years ago |
|
wlf
|
42369e5b49
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
|
zhai_lw
|
29de469afd
|
完成teacherSearchStudent
|
6 years ago |
 zgl
|
0c7700e99a
|
1、global_time_point填写
|
6 years ago |
|
何楚
|
f82ba25a31
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
zhai_lw
|
57893051b8
|
完成teacherSearchStudent
|
6 years ago |
|
zhai_lw
|
db605ef91a
|
完善gdms，
完成用户流程
|
6 years ago |
|
zhai_lw
|
c6e5983cef
|
Merge remote-tracking branches 'remotes/origin/wlf', 'remotes/origin/wmj' and 'remotes/origin/zgl'
|
6 years ago |
|
zhai_lw
|
899f01bd6f
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
zhai_lw
|
0dff0df466
|
完善gdms，
完成用户流程
|
6 years ago |
|
zgl
|
4c8b5c52f8
|
1、完成学生和老师status表，完善数据库
|
6 years ago |
|
wan
|
96258f81e0
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wlf
|
82eac83462
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
6 years ago |
|
wan
|
7ef6908720
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wlf
|
8fc30a753b
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
|
wan
|
c6e2ca10fb
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
06841d30db
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
