Commit Graph

81 Commits

Author SHA1 Message Date
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 a27ee1a3ce update .gitignore 2019-01-26 11:19:11 +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 9cd199db88 忽略配置 2019-01-25 13:16:10 +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 cf6969357c 配置更新 2019-01-20 12:17:03 +08:00
ms group dev ac224eaf2b 配置提交 2019-01-20 12:11:21 +08:00
ms group dev f3e67ff301 删除配置 2019-01-20 12:08:55 +08:00
ms group dev 46bf1967e1 删除配置 2019-01-20 12:06:48 +08:00