Commit Graph

116 Commits

Author SHA1 Message Date
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