Commits · 4b70e2e988a180e6a1600b7f09a907fcb2bccfe2 · jinli gu / MCMS

"ruoyi/vscode:/vscode.git/clone" did not exist on "b9a97ef4aa676f0fb39427c6eed2c78bbab4f044"

29 Jan, 2019 22 commits

Signed-off-by: yinxr <2273460044@qq.com> · 4b70e2e9
yinxr authored Jan 29, 2019

4b70e2e9
Signed-off-by: yinxr <2273460044@qq.com> · a4affb0f
yinxr authored Jan 29, 2019

a4affb0f
Signed-off-by: yinxr <2273460044@qq.com> · 92f04b41
yinxr authored Jan 29, 2019

92f04b41
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS into 4.7.0 · 06d94a95
yinxr authored Jan 29, 2019
```
# Conflicts:
#	src/main/webapp/WEB-INF/manager/include/head-file.ftl
```
06d94a95
Signed-off-by: yinxr <2273460044@qq.com> · 6e454be2
yinxr authored Jan 29, 2019

6e454be2
Signed-off-by: yinxr <2273460044@qq.com> · 2533ec6f
yinxr authored Jan 29, 2019

2533ec6f
配置 · f5aa9b5d
ms-dev authored Jan 29, 2019

f5aa9b5d
配置 · e7f69e0f
ms-dev authored Jan 29, 2019

e7f69e0f
静态资源修改 · 33f8f27a
ms-dev authored Jan 29, 2019

33f8f27a
静态资源 · 0dec546d
ms-dev authored Jan 29, 2019

0dec546d
配置 · 7cf2858e
ms-dev authored Jan 29, 2019

7cf2858e
配置 · 2851cb52
ms-dev authored Jan 29, 2019

2851cb52
配置 · 091fe125
ms-dev authored Jan 29, 2019

091fe125
配置 · 803328dd
ms-dev authored Jan 29, 2019

803328dd
配置更新 · 174458eb
ms-dev authored Jan 29, 2019

174458eb
配置 · 63bfc772
ms-dev authored Jan 29, 2019

63bfc772
配置更新 · c05d7871
ms-dev authored Jan 29, 2019

c05d7871
Merge branch '4.7.0' of https://gitee.com/tianbinjie/MCMS into 4.7.0 · 14b4eefd
ms-dev authored Jan 29, 2019
```
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
```
14b4eefd
Signed-off-by: yinxr <2273460044@qq.com> · 42fb675a
yinxr authored Jan 29, 2019

42fb675a
Signed-off-by: yinxr <2273460044@qq.com> · 8c9a3c37
yinxr authored Jan 29, 2019

8c9a3c37

Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · c6abaf88

yinxr authored Jan 29, 2019



# 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>

c6abaf88

Signed-off-by: yinxr <2273460044@qq.com> · c9bf4f7e
yinxr authored Jan 29, 2019

c9bf4f7e

28 Jan, 2019 12 commits
- Signed-off-by: a123456 <1209165801@qq.com> · 352235a1
  a123456 authored Jan 28, 2019
  
  352235a1
- 后台登录 · fa9020e2
  Administrator authored Jan 28, 2019
  
  fa9020e2
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · a16292b8
  yinxr authored Jan 28, 2019
  
  a16292b8
- Signed-off-by: yinxr <2273460044@qq.com> · b77a2802
  yinxr authored Jan 28, 2019
  
  b77a2802
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 777ef491
  a123456 authored Jan 28, 2019
  
  777ef491
- Signed-off-by: a123456 <1209165801@qq.com> · 2b31eea1
  a123456 authored Jan 28, 2019
  
  2b31eea1
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 2b6ce731
  yinxr authored Jan 28, 2019
  
  2b6ce731
- Signed-off-by: yinxr <2273460044@qq.com> · b974e768
  yinxr authored Jan 28, 2019
  
  b974e768
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 1dca6371
  a123456 authored Jan 28, 2019
  
  1dca6371
- Signed-off-by: a123456 <1209165801@qq.com> · 3797ae5d
  a123456 authored Jan 28, 2019
  
  3797ae5d
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 314f6c50
  yinxr authored Jan 28, 2019
  
  314f6c50
- Signed-off-by: yinxr <2273460044@qq.com> · d23496fc
  yinxr authored Jan 28, 2019
  
  d23496fc
27 Jan, 2019 3 commits
- 内测 · 164b3813
  ms group dev authored Jan 28, 2019
  
  164b3813
- 内测 · c3c4ae46
  ms group dev authored Jan 28, 2019
  
  c3c4ae46
- 描述 · d370748f
  ms group dev authored Jan 27, 2019
  
  d370748f
26 Jan, 2019 3 commits
- Signed-off-by: yinxr <2273460044@qq.com> · b9b3ac1a
  yinxr authored Jan 26, 2019
  
  b9b3ac1a
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · fdf54c8b
  yinxr authored Jan 26, 2019
  
  fdf54c8b
- Signed-off-by: yinxr <2273460044@qq.com> · 84111c4e
  yinxr authored Jan 26, 2019
  
  84111c4e