ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,202 Commits 1 Branch 0 Tags 163 MiB
Commit Graph

295 Commits

Author SHA1 Message Date
wwb 08c4593ca4 Merge remote-tracking branch 'origin/master' 2019-12-13 14:46:54 +08:00
wwb d72bd49c84 bug 2019-12-13 14:46:15 +08:00
sgjj e4f6f46715 Merge remote-tracking branch 'origin/master' 2019-12-13 12:12:31 +08:00
sgjj 8bb777f9ec 修改链接地址 2019-12-13 12:11:19 +08:00
zhongyh 6780c53bbf 增加编号 2019-12-06 18:29:20 +08:00
zhongyh 3894715a7a 修复bug 2019-12-05 15:11:51 +08:00
sgjj 765bfd55e5 添加自定义模型 2019-12-02 14:24:25 +08:00
sgjj f1a1ee7e87 添加自定义模型 2019-11-30 18:04:18 +08:00
zhongyh ad7d54027e 删除老文件 2019-11-30 17:00:27 +08:00
zhongyh c8daf08a82 对接口 2019-11-30 16:59:46 +08:00
tianbj 3624771362 静态化 2019-11-30 13:59:12 +08:00
tianbj a1450f4715 样式 2019-11-30 09:36:05 +08:00
tianbj a96859d733 滚动条 2019-11-29 17:15:35 +08:00
tianbj d668c3825a 跳转 2019-11-29 15:47:51 +08:00
tianbj 5a73e33cca bug 2019-11-29 15:13:04 +08:00
tianbj d15c5508a6 样式 2019-11-29 13:47:10 +08:00
tianbj e127692651 优化 2019-11-29 12:06:01 +08:00
tianbj b3ffa311ed 分类 2019-11-29 09:57:55 +08:00
tianbj 2a4ab99b06 图标 2019-11-28 19:27:25 +08:00
tianbj 5b1f41fcbe 分类文章结构 2019-11-28 19:06:54 +08:00
tianbj d46aff177d 4.7.2 2019-11-28 15:12:40 +08:00
wangtp 278089e78c 文件更新 2019-08-26 10:21:17 +08:00
sgjj 5b77df26f8 升级为平台ms 2019-08-23 16:28:17 +08:00
sgjj fd029a04c5 添加百度统计 2019-08-15 09:27:58 +08:00
sgjj 818f555288 更新 2019-08-14 18:11:02 +08:00
ms-dev c8bc6b700b 欢迎界面更新 2019-05-05 16:02:19 +08:00
ms group dev d712b3ccfe 优化标签结构 2019-04-08 10:22:26 +08:00
sunxin 83e6238e0f 请求方式 2019-03-01 14:10:02 +08:00
sunxin 74c17698cb 请求方式 2019-02-28 19:23:47 +08:00
Administrator e658088863 请求方式统一 2019-02-27 08:46:37 +08:00
sunxin d2151c3837 添加mysql和SQLServer的升级SQL文件和4.7.0文件 2019-02-22 11:39:08 +08:00
ms group dev 04f70236f5 结构更新 2019-02-16 15:14:08 +08:00
ms-dev 149973c60f 结构更新 2019-02-16 15:03:50 +08:00
ms-dev 113064352c 结构更新 2019-02-16 12:00:07 +08:00
a123456 28f9a32442 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 16:35:56 +08:00
a123456 7593e5c0ee Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 16:14:35 +08:00
a123456 9d21710727 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 15:02:56 +08:00
a123456 d5022ad825 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 11:59:39 +08:00
a123456 777a6c572b Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 11:28:16 +08:00
a123456 f3dd3ee888 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-14 18:09:21 +08:00
a123456 02d027bf38 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-13 18:12:55 +08:00
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
yinxr a40c4fb02e fix bug 展开收缩按钮层级问题 2019-01-30 18:05:55 +08:00
yinxr 24df457a41 Signed-off-by: 修复展开收缩图标层级问题 2019-01-30 18:03:21 +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
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 33f8f27acf 静态资源修改 2019-01-29 16:32:32 +08:00
ms-dev 7cf2858ec4 配置 2019-01-29 16:22:40 +08:00
ms-dev 14b4eefd10 Merge branch '4.7.0' of https://gitee.com/tianbinjie/MCMS into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
 2019-01-29 14:47:19 +08:00
yinxr 42fb675a05 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 14:07:39 +08:00
yinxr 8c9a3c3759 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 09:14:01 +08:00
yinxr c6abaf88a0 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/menu.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/picture/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
#	src/main/webapp/static/ms-admin/4.7.0/css/login.css
#	src/main/webapp/static/ms-admin/4.7.0/less/app.less
#	src/main/webapp/static/ms-admin/4.7.0/less/login.less
#	src/main/webapp/static/mweixin/article.less
#	src/main/webapp/static/mweixin/css/article.css
#	src/main/webapp/static/mweixin/css/custom-menu.css
#	src/main/webapp/static/mweixin/css/keyword-list.css
#	src/main/webapp/static/mweixin/css/keyword-reply.css
#	src/main/webapp/static/mweixin/css/material-bank-form.css
#	src/main/webapp/static/mweixin/css/material-list.css
#	src/main/webapp/static/mweixin/css/menu.css
#	src/main/webapp/static/mweixin/css/message-reply.css
#	src/main/webapp/static/mweixin/css/new-pic-form.css
#	src/main/webapp/static/mweixin/css/picture-list.css
#	src/main/webapp/static/mweixin/custom-menu.less
#	src/main/webapp/static/mweixin/keyword-list.less
#	src/main/webapp/static/mweixin/keyword-reply.less
#	src/main/webapp/static/mweixin/material-bank-form.less
#	src/main/webapp/static/mweixin/material-list.less
#	src/main/webapp/static/mweixin/menu.less
#	src/main/webapp/static/mweixin/message-reply.less
#	src/main/webapp/static/mweixin/new-pic-form.less
#	src/main/webapp/static/mweixin/picture-list.less

Signed-off-by: yinxr <2273460044@qq.com>
 2019-01-29 08:52:59 +08:00
yinxr c9bf4f7e66 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 08:49:10 +08:00
a123456 352235a1cf Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 19:13:23 +08:00
Administrator fa9020e2ab 后台登录 2019-01-28 16:21:44 +08:00
yinxr a16292b8ab Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 14:01:31 +08:00
yinxr b77a2802bf Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 14:01:04 +08:00
a123456 777ef491b5 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:59:37 +08:00
a123456 2b31eea136 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 13:59:20 +08:00
yinxr 2b6ce731e0 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:20:59 +08:00
yinxr b974e76854 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 13:20:47 +08:00
a123456 1dca637151 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:08:05 +08:00
a123456 3797ae5dc7 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 13:07:27 +08:00
yinxr d23496fc8c Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 11:11:02 +08:00
yinxr b9b3ac1a34 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 20:31:09 +08:00
yinxr 84111c4e73 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 18:52:55 +08:00
a123456 afa5c53241 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 17:49:27 +08:00
a123456 50793189cb Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
Signed-off-by: a123456 <1209165801@qq.com>
 2019-01-26 17:18:10 +08:00
a123456 90f85790a2 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 17:15:34 +08:00
yinxr ae05dc1d20 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/static/ms-admin/4.7.0/less/app.less
#	src/main/webapp/static/mweixin/css/article.css

Signed-off-by: yinxr <2273460044@qq.com>
 2019-01-26 17:14:47 +08:00
yinxr 83365fee2a Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 17:11:26 +08:00
yinxr 64e44d5622 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 17:02:44 +08:00
a123456 5318c3b966 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 16:48:42 +08:00
a123456 458af1cf95 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 16:45:57 +08:00
a123456 e9deecdf02 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 16:45:46 +08:00
yinxr 0df5bb3d77 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 15:49:03 +08:00
yinxr db7b097eac Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 15:48:48 +08:00
a123456 826dbe2741 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 15:45:43 +08:00
a123456 657fcd9cb8 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 15:45:28 +08:00
yinxr 18bde351e0 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 13:16:40 +08:00
yinxr 9ddf0f046d Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:50:26 +08:00
yinxr 06dadfd783 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:47:01 +08:00
yinxr d56a40dabe Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:45:55 +08:00
a123456 b94ab35ed0 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 12:37:09 +08:00
a123456 7fb6775dba Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 12:15:13 +08:00
a123456 59b486e0d6 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl

Signed-off-by: a123456 <1209165801@qq.com>
 2019-01-26 11:38:24 +08:00
a123456 c3db17b387 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:37:42 +08:00
yinxr cfdd9bfce8 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 11:37:05 +08:00
a123456 c8c23456e4 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:31:23 +08:00
a123456 baada49d7c Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:28:23 +08:00
a123456 84c6864fa4 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:25:44 +08:00
a123456 cc7cf2ecd0 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:24:24 +08:00
a123456 58931f4fcf Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:23:43 +08:00
a123456 ba12a55e12 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:17:36 +08:00
a123456 9820b10744 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:12:45 +08:00
a123456 5fbcb47d0d Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:10:25 +08:00
a123456 a2d57732c8 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 10:48:39 +08:00
a123456 5ae06a867a Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:58:19 +08:00
a123456 ab747ea3d2 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:46:06 +08:00
a123456 3cf902b35a Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:39:43 +08:00
a123456 dc1c2a95c6 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:28:43 +08:00
a123456 6a14782334 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:16:38 +08:00
ms-dev f9544b1d28 头文件更新 2019-01-26 09:11:49 +08:00
yinxr 56dbdd1bd1 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 20:34:33 +08:00
yinxr db5d47bafe Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 19:00:13 +08:00
yinxr c66c003a61 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:57:41 +08:00
yinxr 450cf6f58b Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:33:37 +08:00
yinxr 9b74399cc3 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:31:19 +08:00
yinxr 0b051a3174 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:26:19 +08:00
yinxr 12cabb5d54 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 17:41:48 +08:00
yinxr 56b344b495 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:28:35 +08:00
yinxr 2ca68f84b5 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:25:20 +08:00
yinxr d47f995605 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 15:23:45 +08:00
ms-dev 131b230e3b 结构更新 2019-01-25 13:34:59 +08:00
ms-dev 96891a145c 修改页面 2019-01-25 13:06:50 +08:00
ms-dev db3015e708 配置更新 2019-01-15 17:08:31 +08:00
ms-dev a480376dac 优化结构 2019-01-15 12:01:06 +08:00
killfen cd4672a3dd 配置优化 2019-01-15 10:09:38 +08:00
ms-dev da21280bb3 配置文件更新 2019-01-15 00:54:12 +08:00