Commit Graph
-
c25075991Merge remote-tracking branch 'origin/develop' into develop by 2019-03-21 14:16:54 +0800 -
650cc5d84[营销分析][添加][卡营销列表] by 2019-03-21 14:16:44 +0800 -
ccb678ce1[大屏][修改]:心跳接口返回值更改 by 2019-03-21 13:51:47 +0800 -
6d033aa54[大屏][修改]:增加可配置选项 by 2019-03-21 13:15:04 +0800 -
fbbac3c79[拼团][修改][状态] by 2019-03-21 12:54:09 +0800 -
18e165a38Merge remote-tracking branch 'origin/develop' into develop by 2019-03-21 11:32:08 +0800 -
f9d16d949[营销分析][添加][卡营销列表] by 2019-03-21 11:32:04 +0800 -
15b9711cf[渠道][修改][查询判断] by 2019-03-21 11:19:43 +0800 -
e3adcac60Merge remote-tracking branch 'origin/develop' into develop by 2019-03-21 11:06:28 +0800 -
4812f1847[营销分析][添加][卡营销列表] by 2019-03-21 11:05:35 +0800 -
b79d1548f[拼团][修改][查询] by 2019-03-21 10:34:41 +0800 -
d59ff9eee[设备][修改]:增加设备配置字段 by 2019-03-21 10:23:37 +0800 -
4fdc2f8a8[大屏][修改]:团购券跳转标识 by 2019-03-20 19:14:00 +0800 -
803913e7cMerge remote-tracking branch 'origin/develop' into release by 2019-03-20 18:25:26 +0800 -
873d3404a[BUG][修改][云端测试：version:.782.1095 ：拼团营销数据-查询没有反应] by 2019-03-20 17:36:01 +0800 -
2d7261f56[BUG][修改][云端测试：version:.782.1095 ：拼团营销数据-查询没有反应] by 2019-03-20 17:17:03 +0800 -
c3b6d5efb[BUG][修改][云端测试：version:.782.1095 ：拼团营销数据-查询没有反应] by 2019-03-20 17:12:15 +0800 -
109e2542b[BUG][修改][云端测试：version:.782.1095 ：拼团营销数据-查询没有反应] by 2019-03-20 17:01:38 +0800 -
70d802921[商户][添加][是否显示在C端] by 2019-03-20 16:51:32 +0800 -
8b4c788a0[营销分析][添加][卡营销列表] by 2019-03-20 16:52:20 +0800 -
e3cc0254c[商户][添加][是否显示在C端] by 2019-03-20 16:46:50 +0800 -
95598b0e5[商户][添加][是否显示在C端] by 2019-03-20 16:33:32 +0800 -
8e0da0458[营销分析][添加][卡营销列表] by 2019-03-20 16:04:14 +0800 -
a3791dcc8[营销分析][添加][卡营销列表] by 2019-03-20 16:02:47 +0800 -
f6c58c806[商户][添加][是否显示在C端] by 2019-03-20 16:01:06 +0800 -
c0d2ecd6c[营销分析][添加][卡营销列表] by 2019-03-20 16:01:45 +0800 -
6d75e6771[商户][添加][是否显示在C端] by 2019-03-20 15:57:51 +0800 -
71d0f624f[营销分析][修改][查询] by 2019-03-20 15:42:59 +0800 -
2222e0197[营销分析][修改][查询] by 2019-03-20 15:21:46 +0800 -
15498035d[微信登录][修改]:redis key格式重整 by 2019-03-20 11:07:53 +0800 -
9dd7365c1[微信登录][修改]:清除无用code by 2019-03-20 10:56:19 +0800 -
56040c3f4[微信登录][修改]:清除无用code by 2019-03-20 10:54:59 +0800 -
14d216936[微信登录][修改]:微信登录多tenantId支持 by 2019-03-20 10:48:27 +0800 -
1cf9be056[微信登录][修改]:微信登录多tenantId支持 by 2019-03-20 10:47:01 +0800 -
9a8fe3da3[微信登录][修改]:微信登录多tenantId支持 by 2019-03-20 10:31:58 +0800 -
b109bfc30[砍价][新增]:砍价支付超时时间1小时 by 2019-03-20 10:19:14 +0800 -
1ad64c0b4[砍价][修改]:砍价支付超时时间1小时 by 2019-03-20 10:11:32 +0800 -
e0515e000[短信][修改][回调校验加日志] by 2019-03-19 21:00:30 +0800 -
f9a2cb60f[押金账单][修改][调整金额同时调整欠缴] by 2019-03-19 18:47:59 +0800 -
92c64f7a0[B端账单][修改][查询] by 2019-03-19 18:32:50 +0800 -
f240b85e9Merge tag 'refs/tags/jenkins-back-end-1094' into release by 2019-03-19 17:37:23 +0800 -
e4ddf57cd[微信登录][修改]:登录 by 2019-03-19 17:33:45 +0800 -
94442e10aMerge tag 'refs/tags/jenkins-back-end-1092' into release by 2019-03-19 17:24:58 +0800 -
dc70715f0[拼团][修改][退款] by 2019-03-19 16:58:43 +0800 -
65e7c819a[redis][修改]:setIfAbsent升级支持设置过期时间 by 2019-03-19 16:30:47 +0800 -
271bed29c[B端账单][修改][查询] by 2019-03-19 16:12:11 +0800 -
c33447dec[微信第三方登录][修改]:cookie过期时间设置 by 2019-03-19 15:27:31 +0800 -
16ae1663a[微信第三方登录][修改]:cookie设置到前端 by 2019-03-19 15:09:59 +0800 -
c1842ae10[微信第三方登录][修改]:cookie设置到前端 by 2019-03-19 15:09:28 +0800 -
ed357b85b[微信第三方登录][修改]:cookie设置到前端 by 2019-03-19 15:00:37 +0800 -
00dba2600[微信第三方登录][修改]:cookie设置到前端 by 2019-03-19 14:54:01 +0800 -
9d6a918ca[微信第三方登录][修改]:cookie设置到前端 by 2019-03-19 14:38:59 +0800 -
bec117177[B端账单][修改][查询] by 2019-03-19 14:29:12 +0800 -
ef3a1d087[物业押金][修改][查询不更新状态] by 2019-03-19 11:44:36 +0800 -
67e18711f[微信第三方登录][修改]:登录重定向 by 2019-03-19 14:24:04 +0800 -
94629a5a2[MQConsumer日志][修改]:配置修改 by 2019-03-19 14:12:57 +0800 -
ce7864b9d[MQConsumer日志][修改]:日志目录修改 by 2019-03-19 14:04:09 +0800 -
144949a2a[微信第三方登录][修改]:第一种方法试试 by 2019-03-19 13:43:04 +0800 -
969344a8c[微信第三方登录][修改]:第一种方法试试 by 2019-03-19 13:22:40 +0800 -
eb3ebe590[微信第三方登录][修改]:第一种方法试试 by 2019-03-19 13:13:35 +0800 -
d5e8ee92d[微信第三方登录][修改]:第一种方法试试 by 2019-03-19 13:07:40 +0800 -
edcabf964[微信第三方登录][修改]:第一种方法试试 by 2019-03-19 13:05:39 +0800 -
350c70b1e[营销分析][添加][卡营销列表] by 2019-03-19 11:48:43 +0800 -
b0a68f68c[微信第三方登录][修改]:添加log by 2019-03-19 11:39:26 +0800 -
b7ed2c50cMerge remote-tracking branch 'origin/develop' into release by 2019-03-19 11:28:23 +0800 -
3ff0d07dd[拼团][修改][判断人数] by 2019-03-19 11:21:37 +0800 -
1878c7a7d[营销分析][添加][卡营销列表] by 2019-03-19 11:19:16 +0800 -
fb5ea6515Merge tag 'refs/tags/jenkins-back-end-1073' into release by 2019-03-19 11:08:53 +0800 -
c84a9d008[下订单问题][修改]:无法下订单 by 2019-03-19 11:04:15 +0800 -
a97363dbb[账单][修改][定时催缴时间] by 2019-03-19 10:22:15 +0800 -
7c4195535Merge tag 'refs/tags/jenkins-back-end-1071' into release by 2019-03-18 21:45:15 +0800 -
e403934c1[营销分析][添加][卡营销列表] by 2019-03-18 19:07:35 +0800 -
23d2f8139[log日期格式][修改]:log日期格式修改 by 2019-03-18 17:36:13 +0800 -
002c70cfe[log日期格式][修改]:C端log日期格式修改 by 2019-03-18 15:26:44 +0800 -
9d0656ac0Merge tag 'refs/tags/jenkins-back-end-1068' into release by 2019-03-18 17:20:19 +0800 -
696cbfee9[营销分析][添加][卡营销列表] by 2019-03-18 17:17:18 +0800 -
a2af243fb[BUG][ID1001133][C端，如果拼团后，团满，之前待付款的就不让进行支付，提示团满] by 2019-03-18 17:12:03 +0800 -
54b26e44e[营销分析][添加][卡营销列表] by 2019-03-18 17:04:44 +0800 -
d15f5dbe3[营销分析][添加][卡营销列表] by 2019-03-18 15:46:05 +0800 -
2ef79ab2d[BUG][ID1001133][C端，如果拼团后，团满，之前待付款的就不让进行支付，提示团满] by 2019-03-18 15:30:38 +0800 -
6e92478d6[营销分析][添加][卡营销列表] by 2019-03-18 14:04:37 +0800 -
1e8c22414Merge tag 'refs/tags/jenkins-back-end-1062' into release by 2019-03-18 12:55:20 +0800 -
5aba86aad[MQ环境配置][修改]:rabbitMQ profile enable by 2019-03-18 12:51:08 +0800 -
7ae5d749fMerge tag 'refs/tags/jenkins-back-end-1060' into release by 2019-03-18 12:43:35 +0800 -
f9ea4813b[营销分析][添加][卡营销列表] by 2019-03-18 11:36:21 +0800 -
4a84c13a4[营销分析][添加][卡营销列表] by 2019-03-18 11:01:16 +0800 -
50a3bd1cf[物业账单][修改][更新状态SQL] by 2019-03-18 10:57:42 +0800 -
73dc592c2[营销分析][添加][卡营销列表] by 2019-03-18 10:49:54 +0800 -
7cc314f9e[营销分析][添加][卡营销列表] by 2019-03-18 10:30:11 +0800 -
667c67618[卡转赠][修改][判断] by 2019-03-18 10:25:57 +0800 -
f6f9da299[租赁账单][修改][更新状态SQL] by 2019-03-18 10:22:35 +0800 -
7913faf6e[BUG][ID1001124][卡支付与领取同时问题] by 2019-03-18 10:01:15 +0800 -
0f95efec5[营销分析][添加][卡营销列表] by 2019-03-16 17:54:01 +0800 -
a7d824c13[营销分析][添加][卡营销列表] by 2019-03-16 17:37:37 +0800 -
c9acf3683[营销分析][添加][卡营销列表] by 2019-03-16 17:08:13 +0800 -
3a6a0fb87[MQ环境配置][修改]:TEST/RELEASE环境配置添加 by 2019-03-16 16:23:19 +0800 -
688ec543a[营销分析][添加][卡营销列表] by 2019-03-16 16:21:14 +0800 -
dedc790a3[账单][修改][状态] by 2019-03-16 15:09:55 +0800 -
0124596f3[账单][修改][提醒] by 2019-03-16 14:22:39 +0800 -
d0048d9d6[拼团营销分析][修改][参数] by 2019-03-16 14:22:13 +0800