Commits · 314f6c50d1122822ee6ba1c94e0426e4fd758e4e · 西魏 / cms_sys

28 Jan, 2019 2 commits
- 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 27, 2019
  
  164b3813
- 内测 · c3c4ae46
  ms group dev authored Jan 27, 2019
  
  c3c4ae46
- 描述 · d370748f
  ms group dev authored Jan 27, 2019
  
  d370748f
26 Jan, 2019 35 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
- 配置文件更新 · 4466019d
  ms-dev authored Jan 26, 2019
  
  4466019d
- 配置文件更新 · d12ee233
  ms-dev authored Jan 26, 2019
  
  d12ee233
- Signed-off-by: a123456 <1209165801@qq.com> · 9b306f83
  a123456 authored Jan 26, 2019
  
  9b306f83
- Signed-off-by: a123456 <1209165801@qq.com> · 9d186905
  a123456 authored Jan 26, 2019
  
  9d186905
- Signed-off-by: a123456 <1209165801@qq.com> · afa5c532
  a123456 authored Jan 26, 2019
  
  afa5c532
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 50793189
  a123456 authored Jan 26, 2019
```
Signed-off-by: a123456 <1209165801@qq.com>
```
  50793189
- Signed-off-by: a123456 <1209165801@qq.com> · 90f85790
  a123456 authored Jan 26, 2019
  
  90f85790
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · ae05dc1d
  yinxr authored Jan 26, 2019
```
# 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>
```
  ae05dc1d
- Signed-off-by: yinxr <2273460044@qq.com> · 83365fee
  yinxr authored Jan 26, 2019
  
  83365fee
- Signed-off-by: yinxr <2273460044@qq.com> · 64e44d56
  yinxr authored Jan 26, 2019
  
  64e44d56
- Signed-off-by: a123456 <1209165801@qq.com> · 5318c3b9
  a123456 authored Jan 26, 2019
  
  5318c3b9
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 458af1cf
  a123456 authored Jan 26, 2019
  
  458af1cf
- Signed-off-by: a123456 <1209165801@qq.com> · e9deecdf
  a123456 authored Jan 26, 2019
  
  e9deecdf
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 0df5bb3d
  yinxr authored Jan 26, 2019
  
  0df5bb3d
- Signed-off-by: yinxr <2273460044@qq.com> · db7b097e
  yinxr authored Jan 26, 2019
  
  db7b097e
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 826dbe27
  a123456 authored Jan 26, 2019
  
  826dbe27
- Signed-off-by: a123456 <1209165801@qq.com> · 657fcd9c
  a123456 authored Jan 26, 2019
  
  657fcd9c
- Signed-off-by: yinxr <2273460044@qq.com> · 80be2e4c
  yinxr authored Jan 26, 2019
  
  80be2e4c
- Signed-off-by: yinxr <2273460044@qq.com> · 18bde351
  yinxr authored Jan 26, 2019
  
  18bde351
- Signed-off-by: yinxr <2273460044@qq.com> · 9ddf0f04
  yinxr authored Jan 26, 2019
  
  9ddf0f04
- Signed-off-by: yinxr <2273460044@qq.com> · 06dadfd7
  yinxr authored Jan 26, 2019
  
  06dadfd7
- Signed-off-by: yinxr <2273460044@qq.com> · d56a40da
  yinxr authored Jan 26, 2019
  
  d56a40da
- Signed-off-by: a123456 <1209165801@qq.com> · b94ab35e
  a123456 authored Jan 26, 2019
  
  b94ab35e
- Signed-off-by: a123456 <1209165801@qq.com> · 7fb6775d
  a123456 authored Jan 26, 2019
  
  7fb6775d
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 59b486e0
  a123456 authored Jan 26, 2019
```
# Conflicts:
#	src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
Signed-off-by: a123456 <1209165801@qq.com>
```
  59b486e0
- Signed-off-by: a123456 <1209165801@qq.com> · c3db17b3
  a123456 authored Jan 26, 2019
  
  c3db17b3
- Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 · 1cdf5f8a
  yinxr authored Jan 26, 2019
  
  1cdf5f8a
- Signed-off-by: yinxr <2273460044@qq.com> · cfdd9bfc
  yinxr authored Jan 26, 2019
  
  cfdd9bfc
- !129 添加4.7.0的升级SQL语句 · be689b39
  他是超人他会飞 authored Jan 26, 2019
```
Merge pull request !129 from 他是超人他会飞/4.7.0
```
  be689b39
- Signed-off-by: a123456 <1209165801@qq.com> · c8c23456
  a123456 authored Jan 26, 2019
  
  c8c23456
- Signed-off-by: a123456 <1209165801@qq.com> · baada49d
  a123456 authored Jan 26, 2019
  
  baada49d
- Signed-off-by: a123456 <1209165801@qq.com> · 84c6864f
  a123456 authored Jan 26, 2019
  
  84c6864f