Commit Graph

91 Commits

Author SHA1 Message Date
cuibaocheng
b88a786767 图片套版生成模块 2021-05-31 15:39:31 +08:00
wans
320f0340a0 Merge branch 'master' of e.coding.net:tsteam/xiangmumokuai/tenlion-module 2021-05-31 14:54:45 +08:00
wans
ed4bfbdfc5 提交用户信息补全验证 2021-05-31 14:54:40 +08:00
cuibaocheng
0fb90b7855 图片套版生成模块 2021-05-28 17:21:43 +08:00
ly19960718
a9addd83fa 名称增加栏目功能 2021-05-28 17:15:16 +08:00
cuibaocheng
5e74174211 图片套版生成模块 2021-05-28 17:08:20 +08:00
cuibaocheng
11644c6515 图片套版生成模块 2021-05-28 17:05:13 +08:00
cuibaocheng
96db030af0 图片套版生成模块 2021-05-28 17:00:15 +08:00
cuibaocheng
b09305e5b0 图片套版生成模块 2021-05-28 16:28:29 +08:00
cuibaocheng
d4e7f53a2f 图片套版生成模块 2021-05-28 15:37:26 +08:00
cuibaocheng
ff1086f98e 素材库模块 2021-05-28 15:34:00 +08:00
ly19960718
36614e7b5f 报名增加修改报名机构接口 2021-05-25 09:38:50 +08:00
wans
16d6b30f52 2021-05-19 2021-05-19 14:37:32 +08:00
wans
b0d1f71337 提交 2021-05-16 09:30:39 +08:00
wans
0c05484af0 Merge branch 'master' of e.coding.net:tsteam/xiangmumokuai/tenlion-module 2021-05-08 16:50:32 +08:00
wans
f1637a3383 添加证件类型 2021-05-08 16:50:21 +08:00
cuibaocheng
91ae5a44da 图片套版生成模块 2021-05-05 13:11:12 +08:00
wans
3cebfb7d25 Merge branch 'master' of e.coding.net:tsteam/xiangmumokuai/tenlion-module 2021-05-03 11:11:56 +08:00
wans
bb5383db8d 添加staff声明 2021-05-03 11:11:34 +08:00
cuibaocheng
9709ca5788 考点分配功能, 考场信息功能 2021-05-02 18:23:27 +08:00
ly19960718
7c3522cacb 修改页面图片预览绑定问题 2021-05-02 17:34:04 +08:00
wans
e37e0ba16a Merge branch 'master' of e.coding.net:tsteam/xiangmumokuai/tenlion-module 2021-05-02 10:06:59 +08:00
wans
7076ce1bfe 人员信息模块 2021-05-02 10:06:51 +08:00
ly19960718
1f86fc9a17 增加类型字段 2021-05-01 17:47:41 +08:00
ly19960718
1d41114ea8 功能修改 2021-05-01 16:29:36 +08:00
ly19960718
9ae0b4306a 功能修改 2021-05-01 16:13:37 +08:00
ly19960718
46092e1864 机构增加机构类型字段 2021-05-01 15:19:34 +08:00
ly19960718
e8c3742e36 库名改变 2021-05-01 11:42:10 +08:00
ly19960718
7feb7ef3c8 修改模块 2021-05-01 10:58:41 +08:00
ly19960718
39b40be8c4 基础功能完成 2021-04-29 17:42:27 +08:00
ly19960718
3e2efe1695 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 11:51:29 +08:00
ly19960718
5b1ff22b8b 增加组织模板,机构模块 2021-04-28 19:10:27 +08:00
ly19960718
80e4725a5c 增加组织模板,机构模块 2021-04-28 19:09:39 +08:00
ly19960718
41f15fc751 Merge remote-tracking branch 'origin/master' 2021-04-28 18:41:29 +08:00
cuibaocheng
8f437928bb 图片套版生成模块 2021-04-28 18:41:18 +08:00
ly19960718
068ed0757e Merge remote-tracking branch 'origin/master' 2021-04-28 18:38:59 +08:00
ly19960718
d761ba75c2 Merge branch 'master' of D:\CF_work\ideaWorkSpace\tenlion-module with conflicts. 2021-04-28 18:38:54 +08:00
cuibaocheng
641bbad953 图片套版生成模块 2021-04-28 18:35:44 +08:00
cuibaocheng
1a877f7236 图片套版生成模块 2021-04-28 14:03:06 +08:00
cuibaocheng
acef88c3b3 图片套版生成模块 2021-04-28 10:26:58 +08:00
937e91f04a fc 2021-04-26 14:57:44 +08:00