ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
843 Commits 1 Branch 0 Tags 163 MiB
Commit Graph

541 Commits

Author SHA1 Message Date
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
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 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
a123456 e9deecdf02 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 16:45:46 +08:00
yinxr 0df5bb3d77 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 15:49:03 +08:00
yinxr db7b097eac Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 15:48:48 +08:00
a123456 826dbe2741 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 15:45:43 +08:00
a123456 657fcd9cb8 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 15:45:28 +08:00
yinxr 80be2e4c3e Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 13:33:27 +08:00
yinxr 18bde351e0 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 13:16:40 +08:00
yinxr 9ddf0f046d Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:50:26 +08:00
yinxr 06dadfd783 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:47:01 +08:00
yinxr d56a40dabe Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:45:55 +08:00
a123456 b94ab35ed0 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 12:37:09 +08:00
a123456 7fb6775dba Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 12:15:13 +08:00
a123456 59b486e0d6 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl

Signed-off-by: a123456 <1209165801@qq.com>
 2019-01-26 11:38:24 +08:00
a123456 c3db17b387 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:37:42 +08:00
yinxr 1cdf5f8a7f Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 11:37:21 +08:00
yinxr cfdd9bfce8 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 11:37:05 +08:00
他是超人他会飞 be689b390e !129 添加4.7.0的升级SQL语句 
Merge pull request !129 from 他是超人他会飞/4.7.0
 2019-01-26 11:34:20 +08:00
a123456 c8c23456e4 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:31:23 +08:00
a123456 baada49d7c Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:28:23 +08:00
a123456 84c6864fa4 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:25:44 +08:00
a123456 cc7cf2ecd0 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:24:24 +08:00
a123456 58931f4fcf Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:23:43 +08:00
a123456 ba12a55e12 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:17:36 +08:00
a123456 9820b10744 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:12:45 +08:00
a123456 5fbcb47d0d Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:10:25 +08:00
a123456 a2d57732c8 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 10:48:39 +08:00
a123456 5ae06a867a Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:58:19 +08:00
a123456 ab747ea3d2 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:46:06 +08:00
a123456 3cf902b35a Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:39:43 +08:00
a123456 dc1c2a95c6 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:28:43 +08:00
a123456 8621fc554d Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:18:07 +08:00
a123456 6a14782334 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:16:38 +08:00
ms-dev f9544b1d28 头文件更新 2019-01-26 09:11:49 +08:00
yinxr 56dbdd1bd1 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 20:34:33 +08:00
yinxr db5d47bafe Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 19:00:13 +08:00
yinxr c66c003a61 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:57:41 +08:00
yinxr 450cf6f58b Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:33:37 +08:00
yinxr 9b74399cc3 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:31:19 +08:00
yinxr 0b051a3174 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:26:19 +08:00
yinxr 12cabb5d54 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 17:41:48 +08:00
yinxr 67d7218de4 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:35:17 +08:00
yinxr 56b344b495 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:28:35 +08:00
yinxr 2ca68f84b5 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:25:20 +08:00
yinxr d47f995605 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 15:23:45 +08:00
ms-dev 131b230e3b 结构更新 2019-01-25 13:34:59 +08:00
ms-dev 96891a145c 修改页面 2019-01-25 13:06:50 +08:00
ms-dev 4689b4e569 界面更新 2019-01-25 12:45:34 +08:00
sunxin eac66fa025 提交升级SQL语句 2019-01-22 17:39:50 +08:00
sunxin 09c72f30cd 文章修改URL链接 2019-01-22 15:42:44 +08:00
ms group dev 6021113800 配置更新 2019-01-20 12:18:44 +08:00
ms group dev 033c6f152d 方法更新 2019-01-20 11:59:59 +08:00
ms group dev 0df7aabc6d 配置更 2019-01-20 11:59:19 +08:00
ms group dev dd4f77889c 配置更新 2019-01-19 12:25:44 +08:00
ms group dev 64cca8add7 配置更新 2019-01-19 12:19:58 +08:00
ms group dev 968500424e 配置更新 2019-01-19 12:11:41 +08:00
ms-dev c611cff678 配置更新 2019-01-17 11:57:26 +08:00
ms-dev 43f7134ddd 配置更新 2019-01-16 16:54:25 +08:00
ms-dev c0972c6c38 配置文件更新 2019-01-16 16:30:00 +08:00
ms-dev 1bb0e45602 配置文件更新 2019-01-16 09:26:24 +08:00
sunxin fdabad7695 添加springboot配置文件 2019-01-15 18:17:38 +08:00
ms-dev eee2850981 配置更新 2019-01-15 17:17:44 +08:00
ms-dev db3015e708 配置更新 2019-01-15 17:08:31 +08:00
ms-dev 3dc5625a7a 代码初始化 2019-01-15 16:03:11 +08:00
ms-dev a480376dac 优化结构 2019-01-15 12:01:06 +08:00
killfen cd4672a3dd 配置优化 2019-01-15 10:09:38 +08:00
ms-dev da21280bb3 配置文件更新 2019-01-15 00:54:12 +08:00
killfen 33bb27debe 配置文件更新 2019-01-14 18:43:01 +08:00
ms-dev 03694f4ed8 更新 2019-01-14 18:07:46 +08:00
ms-dev 1a101f61f5 shiro配置优化 2019-01-04 18:16:37 +08:00
ms-dev f68555e69e shiro配置 2019-01-04 18:08:49 +08:00
ms-dev 49d2a62073 springboot 2019-01-04 17:37:43 +08:00