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 |
|
