Commit Graph

297 Commits

Author SHA1 Message Date
ly19960718
3e8e7eba2e Merge remote-tracking branch 'origin/master' 2021-05-04 15:00:25 +08:00
ly19960718
130306caa0 报名审核逻辑修改,新增获取报名计划接口 2021-05-04 15:00:10 +08:00
Renpc-kilig
c526f838d8 Merge remote-tracking branch 'origin/master' 2021-05-04 14:55:12 +08:00
Renpc-kilig
10b39103d2 考试申请审核功能新增。 2021-05-04 14:55:03 +08:00
wans
c267a60482 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-04 14:25:56 +08:00
wans
a6e0f471a6 添加工种选择树 2021-05-04 14:25:41 +08:00
Renpc-kilig
e4f019a6a1 Merge remote-tracking branch 'origin/master' 2021-05-04 14:23:16 +08:00
Renpc-kilig
09284bd69e 考试申请对接。 2021-05-04 14:23:04 +08:00
wans
418a4975e2 静态文件 2021-05-04 14:02:58 +08:00
wans
0fed8573bf 工种选择 2021-05-04 14:00:54 +08:00
cuibaocheng
d9d45b69f9 Merge remote-tracking branch 'origin/master' 2021-05-04 13:15:29 +08:00
cuibaocheng
dca5112abe 图片套版生成模块 2021-05-04 13:15:07 +08:00
wans
2f85d34cc3 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-04 13:03:59 +08:00
wans
048d149fb0 计划添加Id值返回 2021-05-04 13:03:46 +08:00
ly19960718
5f4bf1f454 修改报名审核逻辑 2021-05-03 18:34:54 +08:00
cuibaocheng
4d1d919d42 考场分配功能 , 准考证生成功能 2021-05-03 18:23:45 +08:00
ly19960718
f6a6d6b3c6 修改页面图片绑 2021-05-03 18:13:08 +08:00
wans
efe94a4b20 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-03 18:08:50 +08:00
wans
8e80f7d8a2 添加培训计划的代码 2021-05-03 18:08:21 +08:00
Renpc-kilig
97c1ce7944 Merge remote-tracking branch 'origin/master' 2021-05-03 17:41:24 +08:00
Renpc-kilig
9cbea10156 考试申请功能新增。 2021-05-03 17:41:12 +08:00
wans
d49c8d604d 讲师包整合 2021-05-03 15:02:09 +08:00
wans
165b358130 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-03 12:02:22 +08:00
wans
75bf76981e 修改讲师 2021-05-03 12:02:09 +08:00
ly19960718
3266b3e412 Merge remote-tracking branch 'origin/master' 2021-05-03 12:01:43 +08:00
ly19960718
5e13473665 修改页面图片绑 2021-05-03 12:01:33 +08:00
wans
1f4c618e71 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-03 11:59:41 +08:00
wans
3cd279b715 课程mapper.xml修改 2021-05-03 11:57:41 +08:00
cuibaocheng
823b1298ef Merge remote-tracking branch 'origin/master' 2021-05-02 18:23:47 +08:00
cuibaocheng
a849dff02f 考点分配功能, 考场信息功能 2021-05-02 18:23:26 +08:00
Renpc-kilig
5a99f0275e Merge remote-tracking branch 'origin/master' 2021-05-02 18:21:54 +08:00
Renpc-kilig
0dfbd33805 考务人员管理
监考人员分配
2021-05-02 18:20:07 +08:00
wans
deef8cb07e 讲师和课程 2021-05-02 18:19:49 +08:00
Renpc-kilig
2659162416 Merge remote-tracking branch 'origin/master' 2021-05-02 18:18:40 +08:00
ly19960718
9d30a5cb10 新增报名功能、培训机构绑定用户功能 2021-05-02 18:17:23 +08:00
ly19960718
b8c7dff614 增加功能工种管理、培训机构管理 2021-05-02 10:40:13 +08:00
cuibaocheng
018ca77f8f 增加考点信息维护与考场信息维护 2021-05-01 18:02:07 +08:00
Renpc-kilig
6b17b59955 Merge branch 'master' of E:\workspace-nice\system-examination-signup with conflicts. 2021-05-01 14:29:05 +08:00
ly19960718
0657276512 新增工种功能 2021-05-01 14:28:44 +08:00
ly19960718
f8f015c324 新增工种类型功能 2021-05-01 14:22:46 +08:00
cuibaocheng
cd5008c842 静态资源文件 2021-05-01 11:34:24 +08:00
cuibaocheng
f315b6cacc 图片套版生成模块 2021-05-01 11:19:19 +08:00
ly19960718
c4bdc1e0d6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/static/assets/images/backgrounds/1.jpg
#	src/main/resources/static/assets/images/backgrounds/2.jpg
#	src/main/resources/static/assets/images/backgrounds/3.jpg
#	src/main/resources/static/assets/images/backgrounds/4.jpg
#	src/main/resources/static/assets/images/backgrounds/5.jpg
#	src/main/resources/static/assets/images/backgrounds/6.jpg
#	src/main/resources/static/assets/images/backgrounds/7.jpg
#	src/main/resources/static/assets/images/backgrounds/8.jpg
#	src/main/resources/static/assets/images/backgrounds/9.jpg
#	src/main/resources/static/assets/js/dialog.js
#	src/main/resources/static/assets/js/vendor/ckplayer/ckplayer/ckplayer.js
#	src/main/resources/static/assets/js/vendor/ueditor/lang/zh-cn/images/localimage.png
#	src/main/resources/static/assets/js/vendor/ueditor/themes/default/css/ueditor.css
#	src/main/resources/static/assets/js/vendor/ueditor/themes/default/css/ueditor.min.css
#	src/main/resources/static/assets/js/vendor/ueditor/themes/iframe.css
#	src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js
#	src/main/resources/static/assets/layuiadmin/config.js
#	src/main/resources/static/assets/layuiadmin/layui/lay/modules/form.js
#	src/main/resources/static/assets/layuiadmin/lib/admin.js
#	src/main/resources/static/assets/layuiadmin/modules/common.js
#	src/main/resources/static/assets/layuiadmin/modules/dialog.js
#	src/main/resources/static/assets/layuiadmin/modules/restajax.js
#	src/main/resources/static/assets/layuiadmin/style/admin.css
#	src/main/resources/static/assets/layuiadmin/style/login.css
#	src/main/resources/static/default.html
2021-04-29 14:30:51 +08:00
cuibaocheng
0f8bef24f7 提交静态文件 2021-04-29 10:40:00 +08:00
ly19960718
b227b4e0be Merge branch 'master' of D:\CF_work\ideaWorkSpace\system-examination-signup with conflicts. 2021-04-28 18:38:52 +08:00
cuibaocheng
0f8fd66d6c 图片套版生成模块 2021-04-28 14:03:04 +08:00
f9701813a1 fc 2021-04-27 14:58:17 +08:00