Commit Graph

1475 Commits

Author SHA1 Message Date
yinxr 28f6da5fdc Signed-off-by: yinxr 图文素材curd接口处理中 2019-02-12 18:46:52 +08:00
yinxr 144968ee40 Signed-off-by: yinxr 自定义菜单的 CURD 2019-02-12 17:00:53 +08:00
yinxr e80dcbf285 Signed-off-by: yinxr 调整微信功能列表页接口的位置 2019-02-12 11:45:09 +08:00
yinxr e40eb6b763 Signed-off-by: yinxr 完成样式修改 2019-02-12 11:27:21 +08:00
yinxr fead0090d5 Signed-off-by: yinxr 添加分组交互及界面 2019-02-12 09:12:06 +08:00
yinxr f960462304 Signed-off-by: yinxr 自定义菜单交互、自定义菜单获取数据接口走通 2019-02-11 18:30:27 +08:00
yinxr 61749c5e4d Signed-off-by: yinxr 子文章删除 2019-02-11 15:49:49 +08:00
yinxr 073a59b534 Signed-off-by: yinxr 新增菜单结构布局调整 2019-02-11 15:25:12 +08:00
yinxr 8cb9e90ae7 Signed-off-by: yinxr 插入超链接交互 2019-02-11 14:57:51 +08:00
sunxin 7fbb94f559 修改获取模块编号方法的参数 2019-01-31 14:44:21 +08:00
sunxin 69191f13a7 Merge branch '4.7.0' of https://gitee.com/sunxinone/MCMS.git into 4.7.0 2019-01-31 09:17:40 +08:00
yinxr a40c4fb02e fix bug 展开收缩按钮层级问题 2019-01-30 18:05:55 +08:00
yinxr 3553238c73 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-30 18:03:37 +08:00
yinxr 24df457a41 Signed-off-by: 修复展开收缩图标层级问题 2019-01-30 18:03:21 +08:00
ms group dev c4d4ba9604 依赖更新 2019-01-30 17:50:14 +08:00
yinxr 7dc07bcffb Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-30 14:34:12 +08:00
yinxr 64c5c6e077 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-30 14:34:06 +08:00
ms group dev 6d78ce00b3 头像 2019-01-30 14:25:36 +08:00
ms-dev 940b4a586f 默认头像 2019-01-30 14:24:08 +08:00
sunxin b8c7cf13d4 标签类型修改 2019-01-30 14:17:15 +08:00
sunxin c88406f320 添加自定义标签权限数据 2019-01-30 14:04:09 +08:00
ms-dev 7453abb3d1 测试配置 2019-01-30 12:03:31 +08:00
ms-dev eb5bc78b73 测试配置更新 2019-01-30 11:58:15 +08:00
ms-dev 01ab9551c4 测试更新 2019-01-30 11:54:35 +08:00
ms-dev cbbd11a751 配置文件命名规范 2019-01-30 11:49:10 +08:00
yinxr 4d731c6c6e Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-30 11:37:51 +08:00
yinxr 7846fc291a Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
# Conflicts:
#	src/main/webapp/WEB-INF/manager/index.ftl
2019-01-30 11:37:39 +08:00
ms group dev cf4bb3beff 前端注释 2019-01-30 11:35:49 +08:00
ms group dev a09d6e8604 前端注释 2019-01-30 11:35:05 +08:00
yinxr fe65622ebf Signed-off-by: yinxr <2273460044@qq.com> 2019-01-30 11:32:03 +08:00
ms group dev a6006152e5 前端变量优化 2019-01-30 11:30:30 +08:00
ms group dev 6a397303b1 注释范例、代码缩进 2019-01-30 11:27:59 +08:00
yinxr b0d1a2284e issue:处理菜单侧边收缩不了的问题 2019-01-30 11:17:44 +08:00
yinxr 180fdb2f98 Signed-off-by: 修改注释,恢复图标 2019-01-30 11:11:39 +08:00
yinxr 2c6d2db173 Signed-off-by: 找回index.less文件,并修复logo样式问题 2019-01-30 11:00:24 +08:00
yinxr 27867d4e8b Signed-off-by: 找回logo、version.log图片 2019-01-30 10:33:48 +08:00
yinxr 4b70e2e988 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 19:36:19 +08:00
yinxr a4affb0f7d Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 18:29:53 +08:00
yinxr 92f04b41f6 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 18:27:38 +08:00
yinxr 06d94a95da Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS into 4.7.0
# Conflicts:
#	src/main/webapp/WEB-INF/manager/include/head-file.ftl
2019-01-29 17:36:27 +08:00
yinxr 6e454be2c0 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 17:03:31 +08:00
yinxr 2533ec6fa2 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 16:57:18 +08:00
ms-dev f5aa9b5d11 配置 2019-01-29 16:50:00 +08:00
ms-dev e7f69e0f04 配置 2019-01-29 16:38:44 +08:00
ms-dev 33f8f27acf 静态资源修改 2019-01-29 16:32:32 +08:00
ms-dev 0dec546d8d 静态资源 2019-01-29 16:27:55 +08:00
ms-dev 7cf2858ec4 配置 2019-01-29 16:22:40 +08:00
ms-dev 2851cb52bc 配置 2019-01-29 16:02:27 +08:00
ms-dev 091fe12552 配置 2019-01-29 16:00:50 +08:00
ms-dev 803328dd73 配置 2019-01-29 15:55:10 +08:00