 何楚
|
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 |
|
wlf
|
96b6fc23b4
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
6 years ago |
|
wlf
|
074cef61da
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
6 years ago |
|
wan
|
159041f5ee
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
a06b0d9ef8
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zgl
|
61726ff313
|
Merge remote-tracking branch 'origin/zgl' into zgl
|
6 years ago |
|
zgl
|
22c5002820
|
1、更新
|
6 years ago |
|
wlf
|
fcfd276d4a
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
wlf
|
22f533255c
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
何楚
|
c7b82d7e82
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
zhai_lw
|
51b73e3813
|
onlineCheck
|
6 years ago |
|
何楚
|
bdd56d806e
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
何楚
|
bd36c4a1f5
|
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
|
b1c174822a
|
登陆注册前后端联通
|
6 years ago |
|
wlf
|
e0fde05f75
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
何楚
|
278bab9db0
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
何楚
|
dd9e2352e4
|
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
|
fe2b89a5fd
|
调整
|
6 years ago |
|
zhai_lw
|
7e9446d1f9
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
|
zhai_lw
|
7420a3362a
|
调整
|
6 years ago |
|
zhai_lw
|
f753c9a1f4
|
合并所有分支，查找合并错误
|
6 years ago |
|
何楚
|
ac8875bcad
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
53e7a50fa1
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
wlf
|
23a948d9e8
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
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 |
|
wan
|
bc51aa29ff
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
|
wan
|
36370116be
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
|
zhai_lw
|
643b2cfe56
|
合并所有分支，查找合并错误
|
6 years ago |
|
zhai_lw
|
1ac5c7b86f
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
f9c7b6ed78
|
Merge remote-tracking branch 'remotes/origin/zgl'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
3c1d9b6906
|
Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts.
|
6 years ago |
|
zhai_lw
|
a96fc2bb1a
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
|
zhai_lw
|
4127803c61
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
6 years ago |
