sgjj
|
b502ca9503
|
样式更新
|
2019-10-29 08:48:36 +08:00 |
tianbj
|
a305de4ece
|
样式
|
2019-10-28 18:21:58 +08:00 |
tianbj
|
dd900e1f1e
|
菜单图标
|
2019-10-28 18:12:30 +08:00 |
tianbj
|
fe55c0edff
|
菜单升级
|
2019-10-28 16:41:34 +08:00 |
tianbj
|
29ce50d775
|
样式
|
2019-10-28 16:34:51 +08:00 |
sgjj
|
c51ba2aa69
|
更新资源文件
|
2019-10-28 10:18:48 +08:00 |
sgjj
|
2de48d5046
|
更新资源文件
|
2019-10-26 17:06:58 +08:00 |
sgjj
|
241a1809e4
|
修复无法访问swagger的问题
|
2019-10-25 13:47:18 +08:00 |
sgjj
|
983de28d50
|
添加组件
|
2019-10-24 15:18:59 +08:00 |
sgjj
|
f891a44ccd
|
添加资源文件
|
2019-10-12 18:35:22 +08:00 |
sgjj
|
0a8e5f575a
|
更新模板
|
2019-10-12 17:38:36 +08:00 |
sgjj
|
11717c3b6e
|
添加资源文件
|
2019-10-12 15:51:59 +08:00 |
铭飞
|
c33fe93a08
|
!188 修复默认主页问题
Merge pull request !188 from 灰色DT/4.7.2
|
2019-10-11 11:39:30 +08:00 |
sgjj
|
7161b213a5
|
xss
|
2019-10-10 10:42:13 +08:00 |
sgjj
|
aa2d8ac17c
|
xss
|
2019-10-10 10:31:37 +08:00 |
sgjj
|
2d4d257bfe
|
修复主页store不显示问题
|
2019-10-09 11:07:31 +08:00 |
sgjj
|
3ddfb59464
|
修复默认不跳主页的问题
|
2019-09-30 14:33:09 +08:00 |
铭飞
|
9b3d486e7f
|
!187 修复linux下相对目录的问题
Merge pull request !187 from 灰色DT/4.7.2
|
2019-09-30 10:09:57 +08:00 |
sgjj
|
e705e84417
|
相对目录
|
2019-09-30 10:02:02 +08:00 |
sgjj
|
bcf4b05477
|
文件配置
|
2019-09-30 01:38:59 +08:00 |
铭飞
|
46bebfa177
|
!186 自定义文件夹
Merge pull request !186 from 灰色DT/4.7.2
|
2019-09-29 22:43:38 +08:00 |
sgjj
|
b5ba1bf1d6
|
自定义文件夹
|
2019-09-29 20:48:49 +08:00 |
sgjj
|
1a1dd38da0
|
自定义路径上传
|
2019-09-25 16:20:39 +08:00 |
铭飞
|
398d5d0544
|
!185 更新配置
Merge pull request !185 from 灰色DT/4.7.2
|
2019-09-06 10:07:36 +08:00 |
sgjj
|
9e733b32eb
|
提交配置
|
2019-09-06 09:25:09 +08:00 |
wangtp
|
ff965f4ec7
|
Merge remote-tracking branch 'origin/4.7.2' into 4.7.2
Conflicts:
src/main/resources/application.yml
|
2019-08-31 08:29:16 +08:00 |
sgjj
|
212b6b1541
|
xxs
|
2019-08-30 18:46:40 +08:00 |
sgjj
|
8617833dba
|
静态资源映射
|
2019-08-27 13:13:47 +08:00 |
sgjj
|
4d95683947
|
静态资源映射
|
2019-08-27 12:26:49 +08:00 |
wangtp
|
278089e78c
|
文件更新
|
2019-08-26 10:21:17 +08:00 |
wangtp
|
111333f731
|
最新版本开源系统演示分支,也是新项目的模板
|
2019-08-26 10:20:46 +08:00 |
wangwenbing
|
af868d14ff
|
Revert "微信修改"
This reverts commit 0871b95a
|
2019-08-24 17:05:36 +08:00 |
wangwenbing
|
0871b95a01
|
微信修改
|
2019-08-24 16:12:48 +08:00 |
sgjj
|
887a3bd306
|
添加资源文件
|
2019-08-24 10:43:16 +08:00 |
sgjj
|
c8be6e2f02
|
自定义上传
|
2019-08-24 10:40:24 +08:00 |
wangtp
|
6da03905cc
|
初始化项目
|
2019-08-23 17:09:39 +08:00 |
sgjj
|
b6cbc7fece
|
单点
|
2019-08-23 16:32:49 +08:00 |
sgjj
|
5b77df26f8
|
升级为平台ms
|
2019-08-23 16:28:17 +08:00 |
sgjj
|
84cb91ec62
|
同步
|
2019-08-19 13:39:54 +08:00 |
wangtp
|
d7517fb958
|
解决xss导致模板不能上传
|
2019-08-15 17:49:18 +08:00 |
sgjj
|
fd029a04c5
|
添加百度统计
|
2019-08-15 09:27:58 +08:00 |
wangtp
|
8a3371cab6
|
更新
|
2019-08-14 18:39:40 +08:00 |
铭飞
|
cfa5e1fdea
|
!177 添加文件限制
Merge pull request !177 from 灰色DT/4.7.1
|
2019-08-14 18:26:50 +08:00 |
sgjj
|
818f555288
|
更新
|
2019-08-14 18:11:02 +08:00 |
sgjj
|
23ad315667
|
修复部分背景无法显示的问题
|
2019-08-14 16:58:58 +08:00 |
sgjj
|
0c3f9794c7
|
添加防xss配置
|
2019-08-13 20:46:39 +08:00 |
灰色DT
|
3c2ce021e5
|
更新 WebConfig.java
|
2019-08-13 20:40:43 +08:00 |
灰色DT
|
ebf79865f0
|
更新 application.yml
|
2019-08-13 15:23:56 +08:00 |
ms group dev
|
e47c97abf5
|
说明
|
2019-08-09 23:22:11 +08:00 |
ms group dev
|
a6b429ddd2
|
移除垃圾文件
|
2019-08-09 23:04:24 +08:00 |
ms group dev
|
ed655b6f12
|
4.7.1更新
|
2019-08-09 22:50:54 +08:00 |
铭飞
|
6d0f70935f
|
!176 修复动态解析
Merge pull request !176 from 灰色DT/4.7.1
|
2019-08-09 22:02:02 +08:00 |
sgjj
|
8206b44273
|
修复动态解析
|
2019-08-09 21:50:39 +08:00 |
ms group dev
|
722590977e
|
模版更新
|
2019-08-09 15:45:50 +08:00 |
sgjj
|
4f54ae2c71
|
修复启动错误
|
2019-08-09 14:46:34 +08:00 |
sgjj
|
e8f2f849b4
|
修复栏目为封面没有文章找不到页面的问题
|
2019-08-08 18:12:46 +08:00 |
sgjj
|
2cc1e5041a
|
优化静态映射路径
|
2019-08-08 16:37:05 +08:00 |
sgjj
|
77a1ba6020
|
搜索模板
|
2019-08-07 18:26:46 +08:00 |
hcong
|
42549f2e0b
|
栏目属性
|
2019-08-07 15:14:52 +08:00 |
ms group dev
|
df3e10c63c
|
配置更新
|
2019-08-06 18:47:19 +08:00 |
lvwj
|
0fd4a57ae1
|
修复默认皮肤
|
2019-06-11 09:28:26 +08:00 |
ms-dev
|
ded33b1af5
|
右边模板js问题
|
2019-05-18 14:38:24 +08:00 |
ms-dev
|
47003f1714
|
优化静态资源文件、优化默认皮肤
|
2019-05-17 12:05:59 +08:00 |
ms-dev
|
bad12870f6
|
测试数据
|
2019-05-16 09:54:48 +08:00 |
ms-dev
|
c8bc6b700b
|
欢迎界面更新
|
2019-05-05 16:02:19 +08:00 |
ms-dev
|
73d2b0fdac
|
增加视图
|
2019-05-05 14:16:05 +08:00 |
ms group dev
|
c551ec5cdc
|
验证框架更新
|
2019-04-25 11:58:38 +08:00 |
ms group dev
|
daf1b09fb6
|
上传控件更新
|
2019-04-25 11:53:06 +08:00 |
ms group dev
|
d07f5b0e32
|
图标本地化
|
2019-04-12 15:18:35 +08:00 |
ms-dev
|
0523c246b2
|
资源文件更新
|
2019-04-09 18:03:25 +08:00 |
ms group dev
|
43fdb95d92
|
更新静态资源
|
2019-04-09 17:58:47 +08:00 |
ms group dev
|
ee40ff0a94
|
资源本地化
|
2019-04-09 17:34:58 +08:00 |
ms group dev
|
15802e879c
|
设置欢迎页
|
2019-04-09 17:27:57 +08:00 |
ms group dev
|
d712b3ccfe
|
优化标签结构
|
2019-04-08 10:22:26 +08:00 |
ms group dev
|
3629f7bb6f
|
静态资源更新
|
2019-04-08 10:22:10 +08:00 |
他是超人他会飞
|
74cc8d5bc0
|
!162 修改用户信息请求方式、添加用户登录ip、去除多余的参数
Merge pull request !162 from 他是超人他会飞/4.7.0
|
2019-03-27 07:38:36 +08:00 |
sunxin
|
67c3975bd7
|
修改用户信息请求方式
|
2019-03-25 18:46:52 +08:00 |
sunxin
|
39076a4238
|
去除多余的参数
|
2019-03-25 16:40:14 +08:00 |
他是超人他会飞
|
59bdeabbc3
|
!160 上下篇的判断修改
Merge pull request !160 from 他是超人他会飞/4.7.0
|
2019-03-19 14:08:31 +08:00 |
sunxin
|
4e7cd16ed0
|
上下篇的判断
|
2019-03-19 14:04:25 +08:00 |
铭飞
|
016fc54903
|
!159 搜索参数修改
Merge pull request !159 from 他是超人他会飞/4.7.0
|
2019-03-19 11:48:52 +08:00 |
Sun Xin
|
77bebfdec5
|
搜索参数修改
|
2019-03-16 10:17:45 +08:00 |
sunxin
|
71c4dc2a1c
|
添加站点编号,修改sql
|
2019-03-15 09:25:03 +08:00 |
sunxin
|
ccfedef9f6
|
搜索修改
|
2019-03-14 14:19:53 +08:00 |
sunxin
|
96b43ef853
|
配置更新
|
2019-03-13 18:18:19 +08:00 |
他是超人他会飞
|
c7ab2ac3de
|
!154 搜索修改
Merge pull request !154 from 他是超人他会飞/4.7.0
|
2019-03-13 16:49:56 +08:00 |
sunxin
|
6a09791e6f
|
搜索修改
|
2019-03-13 16:40:10 +08:00 |
sunxin
|
4ed1a36a47
|
返回栏目模块编号和父栏目编号
|
2019-03-13 16:39:35 +08:00 |
他是超人他会飞
|
0f4dcbdac8
|
!153 添加分页类
Merge pull request !153 from 他是超人他会飞/4.7.0
|
2019-03-13 15:24:13 +08:00 |
sunxin
|
1859f695ad
|
分页
|
2019-03-13 14:36:11 +08:00 |
sunxin
|
c0542503f7
|
分页
|
2019-03-13 14:13:43 +08:00 |
Sun Xin
|
450f27ebc1
|
添加分页类
|
2019-03-12 13:00:55 +08:00 |
他是超人他会飞
|
6ec0df95a8
|
!151 sql 更新
Merge pull request !151 from 他是超人他会飞/4.7.0
|
2019-03-12 10:55:16 +08:00 |
sunxin
|
31f44a51d6
|
sql 更新
|
2019-03-12 10:52:39 +08:00 |
他是超人他会飞
|
93cf6547f4
|
!150 方法优化
Merge pull request !150 from 他是超人他会飞/4.7.0
|
2019-03-06 10:25:59 +08:00 |
sunxin
|
5b7e4fa228
|
方法优化
|
2019-03-06 10:13:54 +08:00 |
他是超人他会飞
|
6b87402522
|
!149 自定义模型字段搜索
Merge pull request !149 from 他是超人他会飞/4.7.0
|
2019-03-05 16:26:04 +08:00 |
sunxin
|
c4ea16f0da
|
注释修改
|
2019-03-05 16:21:56 +08:00 |
sunxin
|
00a8a7c795
|
自定义模型字段搜索
|
2019-03-05 15:55:58 +08:00 |
sunxin
|
6321738201
|
注释修改
|
2019-03-05 10:26:42 +08:00 |
sunxin
|
10c3e4c912
|
上下页修改
|
2019-03-05 10:21:31 +08:00 |
Sun Xin
|
3ddd016266
|
添加引号
|
2019-03-04 20:46:08 +08:00 |
sunxin
|
47568e22c6
|
分页
|
2019-03-04 19:41:47 +08:00 |
Sun Xin
|
b033abee65
|
搜索
|
2019-03-04 01:14:44 +08:00 |
sunxin
|
2443a80c3d
|
修改参数
|
2019-03-02 18:24:57 +08:00 |
sunxin
|
5a7221b1ec
|
搜索修改
|
2019-03-02 18:17:49 +08:00 |
ms group dev
|
03e2ac9b32
|
优化配置
|
2019-03-02 17:17:56 +08:00 |
sunxin
|
900f27b6b4
|
获取地址栏中的url
|
2019-03-02 16:20:05 +08:00 |
sunxin
|
83e6238e0f
|
请求方式
|
2019-03-01 14:10:02 +08:00 |
sunxin
|
081504ef0d
|
搜索注释
|
2019-03-01 12:37:30 +08:00 |
sunxin
|
e868564da3
|
首页链接
|
2019-03-01 11:57:57 +08:00 |
sunxin
|
fab9bfd218
|
判断修改
|
2019-03-01 11:48:37 +08:00 |
sunxin
|
22d6866c5f
|
登录注册链接修改
|
2019-03-01 10:13:54 +08:00 |
sunxin
|
e55e5c23b3
|
列表页
|
2019-03-01 10:08:47 +08:00 |
sunxin
|
cb5f42976e
|
添加URL参数
|
2019-03-01 09:50:27 +08:00 |
sunxin
|
74c17698cb
|
请求方式
|
2019-02-28 19:23:47 +08:00 |
sunxin
|
929077d171
|
添加参数
|
2019-02-28 18:05:30 +08:00 |
sunxin
|
4cf31d35a2
|
添加mysql执行多条SQL
|
2019-02-28 17:44:48 +08:00 |
Sun Xin
|
60bd4c00e0
|
搜索页面方法添加
|
2019-02-27 07:15:28 +08:00 |
Sun Xin
|
2eb223f7ba
|
修改模板名
|
2019-02-27 07:09:20 +08:00 |
sunxin
|
de1c2d2f39
|
mysql 提交
|
2019-02-27 17:48:26 +08:00 |
Administrator
|
f8a4aff276
|
多图上传|隔开,配置修改
|
2019-02-27 09:20:51 +08:00 |
Administrator
|
e658088863
|
请求方式统一
|
2019-02-27 08:46:37 +08:00 |
sunxin
|
5f1131639e
|
SQLServer适配
|
2019-02-25 11:41:05 +08:00 |
sunxin
|
d2151c3837
|
添加mysql和SQLServer的升级SQL文件和4.7.0文件
|
2019-02-22 11:39:08 +08:00 |
ms-dev
|
584168ba86
|
测试地址更新
|
2019-02-19 09:16:10 +08:00 |
ms group dev
|
0955c7e40c
|
欢迎信息更新
|
2019-02-18 10:49:45 +08:00 |
ms-dev
|
d3bd31c56d
|
移除资源
|
2019-02-18 10:45:49 +08:00 |
ms-dev
|
15ffc05b0a
|
测试更新
|
2019-02-18 10:45:14 +08:00 |
他是超人他会飞
|
ab6f0e318c
|
!134 提交默认模版
Merge pull request !134 from 他是超人他会飞/4.7.0
|
2019-02-18 09:37:05 +08:00 |
ms group dev
|
622428dbd2
|
配置更新
|
2019-02-17 21:21:34 +08:00 |
ms group dev
|
26548a7a9e
|
移除资源文件
|
2019-02-17 20:54:33 +08:00 |
sunxin
|
1f0930879b
|
默认模板
|
2019-02-16 17:05:18 +08:00 |
ms group dev
|
04f70236f5
|
结构更新
|
2019-02-16 15:14:08 +08:00 |
ms-dev
|
149973c60f
|
结构更新
|
2019-02-16 15:03:50 +08:00 |
ms-dev
|
113064352c
|
结构更新
|
2019-02-16 12:00:07 +08:00 |
sunxin
|
178009f409
|
Merge branch '4.7.0' of https://gitee.com/sunxinone/MCMS.git into 4.7.0
|
2019-02-16 09:55:42 +08:00 |
a123456
|
28f9a32442
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-02-15 16:35:56 +08:00 |
a123456
|
7593e5c0ee
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-02-15 16:14:35 +08:00 |
a123456
|
9d21710727
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-02-15 15:02:56 +08:00 |
a123456
|
d5022ad825
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-02-15 11:59:39 +08:00 |
a123456
|
777a6c572b
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-02-15 11:28:16 +08:00 |
a123456
|
f3dd3ee888
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-02-14 18:09:21 +08:00 |
a123456
|
02d027bf38
|
Signed-off-by: a123456 <1209165801@qq.com>
|
2019-02-13 18:12:55 +08:00 |
yinxr
|
28f6da5fdc
|
Signed-off-by: yinxr 图文素材curd接口处理中
|
2019-02-12 18:46:52 +08:00 |
yinxr
|
144968ee40
|
Signed-off-by: yinxr 自定义菜单的 CURD
|
2019-02-12 17:00:53 +08:00 |
yinxr
|
e80dcbf285
|
Signed-off-by: yinxr 调整微信功能列表页接口的位置
|
2019-02-12 11:45:09 +08:00 |
yinxr
|
e40eb6b763
|
Signed-off-by: yinxr 完成样式修改
|
2019-02-12 11:27:21 +08:00 |
yinxr
|
fead0090d5
|
Signed-off-by: yinxr 添加分组交互及界面
|
2019-02-12 09:12:06 +08:00 |
yinxr
|
f960462304
|
Signed-off-by: yinxr 自定义菜单交互、自定义菜单获取数据接口走通
|
2019-02-11 18:30:27 +08:00 |
yinxr
|
61749c5e4d
|
Signed-off-by: yinxr 子文章删除
|
2019-02-11 15:49:49 +08:00 |
yinxr
|
073a59b534
|
Signed-off-by: yinxr 新增菜单结构布局调整
|
2019-02-11 15:25:12 +08:00 |
yinxr
|
8cb9e90ae7
|
Signed-off-by: yinxr 插入超链接交互
|
2019-02-11 14:57:51 +08:00 |
sunxin
|
7fbb94f559
|
修改获取模块编号方法的参数
|
2019-01-31 14:44:21 +08:00 |
sunxin
|
69191f13a7
|
Merge branch '4.7.0' of https://gitee.com/sunxinone/MCMS.git into 4.7.0
|
2019-01-31 09:17:40 +08:00 |
yinxr
|
a40c4fb02e
|
fix bug 展开收缩按钮层级问题
|
2019-01-30 18:05:55 +08:00 |
yinxr
|
24df457a41
|
Signed-off-by: 修复展开收缩图标层级问题
|
2019-01-30 18:03:21 +08:00 |
yinxr
|
7dc07bcffb
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
2019-01-30 14:34:12 +08:00 |
yinxr
|
64c5c6e077
|
Signed-off-by: yinxr <2273460044@qq.com>
|
2019-01-30 14:34:06 +08:00 |
ms group dev
|
6d78ce00b3
|
头像
|
2019-01-30 14:25:36 +08:00 |
ms-dev
|
940b4a586f
|
默认头像
|
2019-01-30 14:24:08 +08:00 |
sunxin
|
c88406f320
|
添加自定义标签权限数据
|
2019-01-30 14:04:09 +08:00 |
ms-dev
|
7453abb3d1
|
测试配置
|
2019-01-30 12:03:31 +08:00 |
ms-dev
|
eb5bc78b73
|
测试配置更新
|
2019-01-30 11:58:15 +08:00 |
ms-dev
|
01ab9551c4
|
测试更新
|
2019-01-30 11:54:35 +08:00 |
ms-dev
|
cbbd11a751
|
配置文件命名规范
|
2019-01-30 11:49:10 +08:00 |
yinxr
|
4d731c6c6e
|
Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
|
2019-01-30 11:37:51 +08:00 |
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
|
2019-01-30 11:37:39 +08:00 |
ms group dev
|
cf4bb3beff
|
前端注释
|
2019-01-30 11:35:49 +08:00 |
ms group dev
|
a09d6e8604
|
前端注释
|
2019-01-30 11:35:05 +08:00 |
yinxr
|
fe65622ebf
|
Signed-off-by: yinxr <2273460044@qq.com>
|
2019-01-30 11:32:03 +08:00 |
ms group dev
|
a6006152e5
|
前端变量优化
|
2019-01-30 11:30:30 +08:00 |
ms group dev
|
6a397303b1
|
注释范例、代码缩进
|
2019-01-30 11:27:59 +08:00 |
yinxr
|
b0d1a2284e
|
issue:处理菜单侧边收缩不了的问题
|
2019-01-30 11:17:44 +08:00 |
yinxr
|
180fdb2f98
|
Signed-off-by: 修改注释,恢复图标
|
2019-01-30 11:11:39 +08:00 |
yinxr
|
2c6d2db173
|
Signed-off-by: 找回index.less文件,并修复logo样式问题
|
2019-01-30 11:00:24 +08:00 |
yinxr
|
27867d4e8b
|
Signed-off-by: 找回logo、version.log图片
|
2019-01-30 10:33:48 +08:00 |
yinxr
|
4b70e2e988
|
Signed-off-by: yinxr <2273460044@qq.com>
|
2019-01-29 19:36:19 +08:00 |
yinxr
|
a4affb0f7d
|
Signed-off-by: yinxr <2273460044@qq.com>
|
2019-01-29 18:29:53 +08:00 |
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 |