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>
Please register or sign in to comment