 wlf
|
2c38b26553
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
wlf
|
1689e39545
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
 wan
|
f06566839c
|
Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
wlf
|
d0164dc956
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
|
6 years ago |
|
wlf
|
c6330cb71c
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
|
wlf
|
3a84126bc2
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
|
6 years ago |
|
wlf
|
768b97c4da
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.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 |
|
wlf
|
881abc033a
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
86fbf1db1b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
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 |
|
wlf
|
62759d6b34
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
ad054fde4b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
1f5b0b6f7a
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
dcb917329b
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wlf
|
1d70584bf1
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
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 |
|
wlf
|
8db98cedfb
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
48962fa88c
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.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 |
|
wlf
|
118c44c22b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/Process.java
|
6 years ago |
|
wlf
|
4318035a8f
|
2、更新
|
6 years ago |
|
wlf
|
cb923f9729
|
1、更新
|
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 |
 曾国霖
|
7e1f70ad66
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
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 |
|
曾国霖
|
ccb6d2ba96
|
3、新增删减
|
6 years ago |
|
曾国霖
|
a46b03b56b
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
6 years ago |
|
zhai_lw
|
3637f7c000
|
1，后端process逻辑调整
2，数据库访问逻辑调整
3，数据库访问优化
|
6 years ago |
|
曾国霖
|
00c6b4d330
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
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 |
|
曾国霖
|
65fbf79ffb
|
2、新增删减
|
6 years ago |
|
曾国霖
|
8e2cc1c7d6
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
|
6 years ago |
