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
|
f5aa9b5d11
|
配置
|
2019-01-29 16:50:00 +08:00 |
ms-dev
|
e7f69e0f04
|
配置
|
2019-01-29 16:38:44 +08:00 |
ms-dev
|
33f8f27acf
|
静态资源修改
|
2019-01-29 16:32:32 +08:00 |
ms-dev
|
0dec546d8d
|
静态资源
|
2019-01-29 16:27:55 +08:00 |
ms-dev
|
7cf2858ec4
|
配置
|
2019-01-29 16:22:40 +08:00 |
ms-dev
|
2851cb52bc
|
配置
|
2019-01-29 16:02:27 +08:00 |
ms-dev
|
091fe12552
|
配置
|
2019-01-29 16:00:50 +08:00 |
ms-dev
|
803328dd73
|
配置
|
2019-01-29 15:55:10 +08:00 |
ms-dev
|
174458ebcd
|
配置更新
|
2019-01-29 15:52:17 +08:00 |
ms-dev
|
63bfc772b1
|
配置
|
2019-01-29 15:32:55 +08:00 |
ms-dev
|
c05d78719f
|
配置更新
|
2019-01-29 15:30:55 +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
|
314f6c50d1
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
2019-01-28 11:11:09 +08:00 |
yinxr
|
d23496fc8c
|
Signed-off-by: yinxr <2273460044@qq.com>
|
2019-01-28 11:11:02 +08:00 |
ms group dev
|
164b3813a5
|
内测
|
2019-01-28 05:07:02 +08:00 |
ms group dev
|
c3c4ae463f
|
内测
|
2019-01-28 04:48:18 +08:00 |
ms group dev
|
d370748f50
|
描述
|
2019-01-27 20:55:30 +08:00 |
yinxr
|
b9b3ac1a34
|
Signed-off-by: yinxr <2273460044@qq.com>
|
2019-01-26 20:31:09 +08:00 |
yinxr
|
fdf54c8b02
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
2019-01-26 18:53:08 +08:00 |
yinxr
|
84111c4e73
|
Signed-off-by: yinxr <2273460044@qq.com>
|
2019-01-26 18:52:55 +08:00 |
ms-dev
|
4466019ddf
|
配置文件更新
|
2019-01-26 18:14:49 +08:00 |
ms-dev
|
d12ee233e8
|
配置文件更新
|
2019-01-26 18:13:27 +08:00 |
a123456
|
9b306f83f0
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-01-26 17:54:11 +08:00 |
a123456
|
9d186905ca
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-01-26 17:51:37 +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 |