 wan
|
30a6762f7d
|
增加iconurl
|
7 years ago |
|
wan
|
1b127f1c80
|
process命名
|
7 years ago |
|
wan
|
e7ff9864bb
|
修改完的process
|
7 years ago |
 zhai_lw
|
5c58652c51
|
tomcat升级
|
7 years ago |
|
wan
|
e91f928854
|
修改完的process
|
7 years ago |
|
wan
|
2268a18d58
|
修改process
|
7 years ago |
|
wan
|
43ee705f49
|
修改process
|
7 years ago |
 wlf
|
140cf87adf
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
|
7 years ago |
|
wlf
|
1ca68a9b9b
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
|
7 years ago |
|
wan
|
c660b8c1cb
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# src/servlet/S_StudentUploadOpeningReport.java
|
7 years ago |
|
wlf
|
5716a978e8
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
7 years ago |
|
zhai_lw
|
c63578ca78
|
检查C_Process
|
7 years ago |
|
wan
|
061437836c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wan
|
f5a8a777a3
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# src/servlet/S_StudentUploadOpeningReport.java
|
7 years ago |
|
zhai_lw
|
a02f896fc4
|
检查C_Process
|
7 years ago |
|
wan
|
9b3adc14d5
|
Merge remote-tracking branch 'remotes/origin/wlf'
# Conflicts:
# src/servlet/S_StudentUploadOpeningReport.java
|
7 years ago |
|
wan
|
6ed473563d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/misc.xml
# src/core/process/C_StudentUploadOpeningReport.java
|
7 years ago |
|
wan
|
ad2cb3d81f
|
增加Process
|
7 years ago |
|
wlf
|
b3317a2850
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
7 years ago |
|
zhai_lw
|
2bd6e8c4c9
|
S_Servlet完成
|
7 years ago |
|
wan
|
d2b9c841e1
|
增加Process
|
7 years ago |
|
zhai_lw
|
57893051b8
|
完成teacherSearchStudent
|
7 years ago |
|
zhai_lw
|
c6e5983cef
|
Merge remote-tracking branches 'remotes/origin/wlf', 'remotes/origin/wmj' and 'remotes/origin/zgl'
|
7 years ago |
|
zhai_lw
|
0dff0df466
|
完善gdms，
完成用户流程
|
7 years ago |
|
wan
|
96258f81e0
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
7 years ago |
|
wlf
|
82eac83462
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# src/core/process/C_StudentUploadOpeningReport.java
|
7 years ago |
|
wan
|
7ef6908720
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
7 years ago |
|
wlf
|
8fc30a753b
|
Merge remote-tracking branch 'remotes/origin/wmj' into wlf
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
# .idea/misc.xml
# GDMS.iml
|
7 years ago |
|
wan
|
c6e2ca10fb
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
7 years ago |
|
wan
|
06841d30db
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
7 years ago |
|
wlf
|
074cef61da
|
Merge remote-tracking branch 'remotes/origin/master' into wlf
# Conflicts:
# src/servlet/account/Register.java
|
7 years ago |
|
wan
|
159041f5ee
|
Merge remote-tracking branch 'remotes/origin/hechu1' into wmj
# Conflicts:
# GDMS.iml
|
7 years ago |
|
zhai_lw
|
b1c174822a
|
登陆注册前后端联通
|
7 years ago |
|
zhai_lw
|
f753c9a1f4
|
合并所有分支，查找合并错误
|
7 years ago |
|
wan
|
36370116be
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
7 years ago |
|
zhai_lw
|
4127803c61
|
Merge remote-tracking branch 'remotes/origin/wmj'
# Conflicts:
# .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
|
7 years ago |
|
zhai_lw
|
7c09829e78
|
Process调整
Condition完善
Processmanagement完善
status约定
|
7 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
|
7 years ago |
|
wan
|
b6f6e5c73b
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 years ago |
|
wan
|
dfcd434b07
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 years ago |
|
wan
|
3cbe7c42d8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 years ago |
|
wan
|
6ae3efd617
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/operation/Search.json
|
7 years ago |
|
wan
|
97f6d812b3
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
7 years ago |
|
wan
|
776ed667b8
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
7 years ago |
|
wan
|
dbc64deef5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
# src/core/process/ProcessManagement.java
|
7 years ago |
|
wan
|
ac773da1d5
|
Merge remote-tracking branch 'remotes/origin/master' into wmj
# Conflicts:
# src/core/process/Process.java
|
7 years ago |
|
zhai_lw
|
3637f7c000
|
1，后端process逻辑调整
2，数据库访问逻辑调整
3，数据库访问优化
|
7 years ago |
|
zhai_lw
|
531fb6ef83
|
1,登录后端
|
7 years ago |
|
zhai_lw
|
e5f76c397b
|
1, process 调整为3类
2，完善Exception
|
7 years ago |
|
zhai_lw
|
3ca251506a
|
1, 调整
|
7 years ago |
