 何楚
|
139d16b702
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/GDMS.java
|
6 years ago |
 zhai_lw
|
e4acad3a6d
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
20058dd88f
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
255db387e1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# .idea/artifacts/gdms_war_exploded.xml
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
a39e20d3db
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
4a41175a0d
|
rewrite Process
|
6 years ago |
 wan
|
c382405994
|
日期格式化
|
6 years ago |
|
wan
|
057abc2477
|
增加process
|
6 years ago |
|
wan
|
0bbdd94575
|
增加process
|
6 years ago |
|
wan
|
113890c5f6
|
补充Service
|
6 years ago |
|
何楚
|
e744f97b8c
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/gdms/test.java
|
6 years ago |
|
zhai_lw
|
e2b0fcc128
|
rewrite Process
|
6 years ago |
|
何楚
|
2522730dad
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
何楚
|
4a2ef0ab6d
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/artifacts/gdms_Web_exploded.xml
# .idea/artifacts/gdms_war_exploded.xml
# .idea/misc.xml
|
6 years ago |
|
zhai_lw
|
78666e3a41
|
rewrite Process
|
6 years ago |
|
何楚
|
211b4b69ec
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
|
6 years ago |
|
何楚
|
8f2eb869a2
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/artifacts/gdms_Web_exploded.xml
# .idea/artifacts/gdms_war_exploded.xml
# .idea/misc.xml
|
6 years ago |
|
zhai_lw
|
ed7bcee5b9
|
debug condition
|
6 years ago |
|
zhai_lw
|
3976d3677e
|
Merge remote-tracking branch 'remotes/origin/wmj'
|
6 years ago |
|
zhai_lw
|
49bcc9b319
|
debug condition
|
6 years ago |
|
何楚
|
861f142ead
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
wan
|
2259cabba3
|
补充Service
|
6 years ago |
|
何楚
|
c29dea0a04
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
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
|
55a1d718f1
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
zhai_lw
|
db1069d7c1
|
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
|
ea7a6c6537
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
8af0c704a8
|
修改iconurl
|
6 years ago |
|
wan
|
6b6b333f46
|
完善process
|
6 years ago |
|
wan
|
e69d6f0bce
|
完善process
|
6 years ago |
|
zhai_lw
|
a0c88902e5
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# GDMS.iml
|
6 years ago |
|
wan
|
cf422038a2
|
Merge remote-tracking branch 'remotes/origin/zgl' into wmj
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
 zgl
|
564dfcc57a
|
Merge remote-tracking branch 'remotes/origin/wmj' into zgl
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
|
6 years ago |
|
zgl
|
e291f3dfd1
|
Merge remote-tracking branch 'remotes/origin/wmj' into zgl
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
|
6 years ago |
|
zgl
|
36d73d4096
|
Merge remote-tracking branch 'remotes/origin/wmj' into zgl
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
6 years ago |
|
wan
|
30a6762f7d
|
增加iconurl
|
6 years ago |
|
zhai_lw
|
9433c8ad1a
|
Merge remote-tracking branches 'remotes/origin/wmj' and 'remotes/origin/zgl'
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
|
6 years ago |
|
zhai_lw
|
6aee5b693a
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
wan
|
1b127f1c80
|
process命名
|
6 years ago |
|
zhai_lw
|
1473462317
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
zgl
|
d82601a028
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/dataSources.xml
# .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml
# .idea/libraries/tomcat_lib.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
|
zgl
|
721076b14b
|
Merge remote-tracking branch 'remotes/origin/master' into zgl
# Conflicts:
# .idea/artifacts/GDMS_war_exploded.xml
# .idea/dataSources.xml
# .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml
# .idea/libraries/tomcat_lib.xml
# .idea/misc.xml
# GDMS.iml
|
6 years ago |
|
wan
|
e7ff9864bb
|
修改完的process
|
6 years ago |
|
zhai_lw
|
4e8235598f
|
Merge remote-tracking branch 'remotes/origin/hechu1'
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
何楚
|
f52e6bd7ef
|
Merge remote-tracking branch 'remotes/origin/master' into hechu1
# Conflicts:
# src/core/process/C_TeacherSearchStudent.java
# web/jsFile/upload_action.js
|
6 years ago |
|
zhai_lw
|
5c58652c51
|
tomcat升级
|
6 years ago |
|
wan
|
e91f928854
|
修改完的process
|
6 years ago |
|
wan
|
2268a18d58
|
修改process
|
6 years ago |
|
wan
|
43ee705f49
|
修改process
|
6 years ago |
