ms group dev
|
c4d4ba9604
|
依赖更新
|
7 years ago |
yinxr
|
7dc07bcffb
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
7 years ago |
|
yinxr
|
64c5c6e077
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
ms group dev
|
6d78ce00b3
|
头像
|
7 years ago |
|
ms-dev
|
940b4a586f
|
默认头像
|
7 years ago |
sunxin
|
b8c7cf13d4
|
标签类型修改
|
7 years ago |
|
sunxin
|
c88406f320
|
添加自定义标签权限数据
|
7 years ago |
|
ms-dev
|
7453abb3d1
|
测试配置
|
7 years ago |
|
ms-dev
|
eb5bc78b73
|
测试配置更新
|
7 years ago |
|
ms-dev
|
01ab9551c4
|
测试更新
|
7 years ago |
|
ms-dev
|
cbbd11a751
|
配置文件命名规范
|
7 years ago |
|
yinxr
|
4d731c6c6e
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
7 years ago |
|
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
|
7 years ago |
|
ms group dev
|
cf4bb3beff
|
前端注释
|
7 years ago |
|
ms group dev
|
a09d6e8604
|
前端注释
|
7 years ago |
|
yinxr
|
fe65622ebf
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
ms group dev
|
a6006152e5
|
前端变量优化
|
7 years ago |
|
ms group dev
|
6a397303b1
|
注释范例、代码缩进
|
7 years ago |
|
yinxr
|
b0d1a2284e
|
issue：处理菜单侧边收缩不了的问题
|
7 years ago |
|
yinxr
|
180fdb2f98
|
Signed-off-by: 修改注释，恢复图标
|
7 years ago |
|
yinxr
|
2c6d2db173
|
Signed-off-by: 找回index.less文件，并修复logo样式问题
|
7 years ago |
|
yinxr
|
27867d4e8b
|
Signed-off-by: 找回logo、version.log图片
|
7 years ago |
|
yinxr
|
4b70e2e988
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
yinxr
|
a4affb0f7d
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
yinxr
|
92f04b41f6
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
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
|
7 years ago |
|
yinxr
|
6e454be2c0
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
yinxr
|
2533ec6fa2
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
ms-dev
|
f5aa9b5d11
|
配置
|
7 years ago |
|
ms-dev
|
e7f69e0f04
|
配置
|
7 years ago |
|
ms-dev
|
33f8f27acf
|
静态资源修改
|
7 years ago |
|
ms-dev
|
0dec546d8d
|
静态资源
|
7 years ago |
|
ms-dev
|
7cf2858ec4
|
配置
|
7 years ago |
|
ms-dev
|
2851cb52bc
|
配置
|
7 years ago |
|
ms-dev
|
091fe12552
|
配置
|
7 years ago |
|
ms-dev
|
803328dd73
|
配置
|
7 years ago |
|
ms-dev
|
174458ebcd
|
配置更新
|
7 years ago |
|
ms-dev
|
63bfc772b1
|
配置
|
7 years ago |
|
ms-dev
|
c05d78719f
|
配置更新
|
7 years ago |
|
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
|
7 years ago |
|
yinxr
|
42fb675a05
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
yinxr
|
8c9a3c3759
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
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>
|
7 years ago |
|
yinxr
|
c9bf4f7e66
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
a123456
|
352235a1cf
|
Signed-off-by: a123456 <1209165801@qq.com>
|
7 years ago |
Administrator
|
fa9020e2ab
|
后台登录
|
7 years ago |
|
yinxr
|
a16292b8ab
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
7 years ago |
|
yinxr
|
b77a2802bf
|
Signed-off-by: yinxr <2273460044@qq.com>
|
7 years ago |
|
a123456
|
777ef491b5
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
7 years ago |
|
a123456
|
2b31eea136
|
Signed-off-by: a123456 <1209165801@qq.com>
|
7 years ago |
