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 |
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 |
wlf
|
c4e5462dfc
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
759e95877f
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wan
|
7e7a4a96bb
|
Merge remote-tracking branch 'remotes/origin/wlf' into wmj
# Conflicts:
# GDMS.iml
# src/servlet/account/login.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 |
wlf
|
b146837ead
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.java
|
6 years ago |
wlf
|
8391705ddb
|
Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf
# Conflicts:
# GDMS.iml
# src/servlet/account/login.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
|
cebf16350e
|
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
|
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 |