 zhai_lw
|
a1c83ce362
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
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
|
ce9ae99567
|
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
|
41b844f672
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
zhai_lw
|
c63578ca78
|
检查C_Process
|
6 years ago |
 wan
|
d2b9c841e1
|
增加Process
|
6 years ago |
|
zhai_lw
|
c6e5983cef
|
Merge remote-tracking branches 'remotes/origin/wlf', 'remotes/origin/wmj' and 'remotes/origin/zgl'
|
6 years ago |
 wlf
|
074cef61da
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
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
|
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 |
|
zhai_lw
|
8f599b3e18
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
wan
|
dfcd434b07
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
wan
|
3cbe7c42d8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
zhai_lw
|
ff8bd763fa
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
zhai_lw
|
e8f865cc68
|
1，后端Operation逻辑调整
2，数据库访问逻辑调整
3，AccountManagement调整优化
4，完善功能4/6
|
6 years ago |
 何楚
|
3b0ce6ab27
|
1, 选择界面
|
6 years ago |
|
何楚
|
b851efe5b8
|
1, 主页，前端基本框架
|
6 years ago |
|
zhai_lw
|
531fb6ef83
|
1,登录后端
|
6 years ago |
|
zhai_lw
|
e0b4bcf1cf
|
1, 调整
|
6 years ago |
