 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 |
|
zhai_lw
|
d1bcd170f1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
7c09829e78
|
Process调整
Condition完善
Processmanagement完善
status约定
|
6 years ago |
 何楚
|
9f6ebaf9fb
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
|
何楚
|
bd91d5b5b7
|
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
|
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 |
|
何楚
|
aa7d6ce390
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/operation/Select.json
# src/core/process/Process.java
|
6 years ago |
 wan
|
b6f6e5c73b
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
wan
|
dfcd434b07
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
zhai_lw
|
fffef13eb9
|
1,调整
|
6 years ago |
|
wan
|
3cbe7c42d8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
wan
|
0e8a2a1ebb
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
|
6 years ago |
|
wan
|
6ae3efd617
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
6 years ago |
|
zhai_lw
|
36fb645981
|
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
1,基本完成Operation
2，调整AccountManagement
3，其余
|
6 years ago |
|
wan
|
97f6d812b3
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
6 years ago |
|
zhai_lw
|
9f31df0a89
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
|
何楚
|
d6350f17d4
|
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
|
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 |
|
zhai_lw
|
e58825d4ff
|
1，后端Operation逻辑调整
2，数据库访问逻辑调整
3，AccountManagement调整优化
4，完善功能4/6
|
6 years ago |
|
wan
|
776ed667b8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
6 years ago |
|
wan
|
f118828854
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
|
6 years ago |
|
何楚
|
3cf0f35521
|
1, 选择界面
|
6 years ago |
|
wan
|
dbc64deef5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
6 years ago |
|
zhai_lw
|
8eb298d93c
|
1，后端Operation逻辑调整
2，数据库访问逻辑调整
3，AccountManagement调整优化
4，完善功能4/6
|
6 years ago |
|
何楚
|
3b0ce6ab27
|
1, 选择界面
|
6 years ago |
|
wan
|
ac773da1d5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
zhai_lw
|
3637f7c000
|
1，后端process逻辑调整
2，数据库访问逻辑调整
3，数据库访问优化
|
6 years ago |
|
何楚
|
6f4aac88f0
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
何楚
|
08bf737f19
|
1, 主页，前端基本框架
|
6 years ago |
|
wan
|
6d20631b20
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
wan
|
713dc29a31
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wmj
|
6 years ago |
|
zhai_lw
|
01f4409f14
|
1,后端功能2/5
|
6 years ago |
|
何楚
|
c2cea81958
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
zhai_lw
|
615933c50a
|
1,后端注册完善
|
6 years ago |
|
何楚
|
a4f470b828
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
何楚
|
b851efe5b8
|
1, 主页，前端基本框架
|
6 years ago |
|
zhai_lw
|
c8746f9e72
|
1,后端注册完成
|
6 years ago |
|
zhai_lw
|
3f6fc68933
|
Merge remote-tracking branch 'remotes/origin/wmj'
|
6 years ago |
|
wan
|
e42121d857
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wmj
|
6 years ago |
|
zhai_lw
|
04a929c714
|
1,登录前端和后端对接
|
6 years ago |
|
zhai_lw
|
90d6124e61
|
Merge remote-tracking branch 'remotes/origin/hechu1'
|
6 years ago |
|
zhai_lw
|
41a590d63a
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/servlet/account/login.java
# web/WEB-INF/web.xml
# web/webPage/jsFile/login.js
|
6 years ago |
|
何楚
|
5503126da3
|
1, 主页，前端基本框架
|
6 years ago |
|
zhai_lw
|
531fb6ef83
|
1,登录后端
|
6 years ago |
|
何楚
|
7c29e6c688
|
1, 主页，前端基本框架
|
6 years ago |
|
wan
|
3cd548afce
|
删除无关文件
|
6 years ago |
|
wan
|
8e4fecf3cc
|
选题process
|
6 years ago |
 曾国霖
|
dc01bad92d
|
2.0
|
6 years ago |
