d6689219f
[status获取][修改]:post改为get by
2019-03-28 09:49:10 +0800
1eb3e7ef0
[卡完结][修改]:卡完结,merchant填0 by
2019-03-27 14:17:49 +0800
c6aab577b
[status获取][修改]:post改为get by
2019-03-28 09:49:10 +0800
101563d77
[商户][修改][添加多商铺] by
2019-03-27 18:33:14 +0800
090fa74ed
[分账对账单][修改][查询] by
2019-03-27 14:22:25 +0800
e5a481a30
[卡完结][修改]:卡完结,merchant填0 by
2019-03-27 14:17:49 +0800
51e3d0766
[券][添加][拼团下架] by
2019-03-27 13:21:09 +0800
802521f21
[券][添加][拼团下架] by
2019-03-27 13:19:10 +0800
9ca40aa80
Merge commit 'refs/tags/jenkins-back-end-1171^{}' into release by
2019-03-26 23:51:13 +0800
71cfd413f
[营销数据][修改][砍价成功率加租户id] by
2019-03-26 23:41:00 +0800
4655f4fb1
Merge tag 'refs/tags/jenkins-back-end-1169' into release by
2019-03-26 19:24:46 +0800
6782b3ae0
[banner更新检查][修改]:添加检查 by
2019-03-26 19:12:49 +0800
809a0f930
Merge commit 'refs/tags/jenkins-back-end-1167^{}' into release by
2019-03-26 15:59:29 +0800
ac9b1d1d2
[分账][修改]:增加订单查询判断 by
2019-03-26 15:49:56 +0800
8da6fec0a
[分账][修改]:增加订单查询判断 by
2019-03-26 15:49:56 +0800
c13056aef
Merge commit 'refs/tags/jenkins-back-end-1165^{}' into release by
2019-03-26 15:03:33 +0800
ccba39392
[分账][修复]:分账完结查询的问题 by
2019-03-26 14:49:53 +0800
4249d514e
Merge tag 'refs/tags/jenkins-back-end-1163' into release by
2019-03-26 12:12:21 +0800
3290a1f85
[预览账单][修改][调整生成预览账单逻辑] by
2019-03-26 11:52:17 +0800
c676f114e
[前端参数检查][修改]:添加检查 by
2019-03-25 19:57:36 +0800
3e9acf5d8
Merge tag 'refs/tags/jenkins-back-end-1162' into release by
2019-03-26 10:03:27 +0800
11903372d
[商户][修改]:商户会员等级排序 by
2019-03-25 18:30:51 +0800
e0fa3e65b
[短信组件][修改][修改延迟消息问题] by
2019-03-25 18:20:26 +0800
2d17c6c55
[短信组件][修改][修改延迟消息问题] by
2019-03-25 18:05:48 +0800
51c82c692
Merge commit 'refs/tags/jenkins-back-end-1160^{}' into release by
2019-03-25 17:55:54 +0800
9691b29e7
[短信组件][修改][修改延迟消息问题] by
2019-03-25 17:07:47 +0800
a1629659a
[短信组件][修改][修改延迟消息问题] by
2019-03-25 17:07:00 +0800
fd2b60137
[短信组件][修改][修改延迟消息问题] by
2019-03-25 16:51:50 +0800
2d253c1c2
[短信组件][修改][修改延迟消息问题] by
2019-03-25 16:49:51 +0800
8bd1a8602
[短信组件][修改][修改延迟消息问题] by
2019-03-25 15:29:32 +0800
18034aab6
[TOKEN][调整]:用const代替数字 by
2019-03-25 14:49:02 +0800
c3f7a9681
[TOKEN][调整]:优化token及过期变量存放位置 by
2019-03-25 14:16:45 +0800
5c32d7b3a
[C端][优化]:C端获取信息优化,减少访问wx_c_user次数 by
2019-03-25 14:07:13 +0800
2de97d5da
[短信][修改][字段] by
2019-03-25 14:24:40 +0800
f40074cc4
[短信组件][修改][修改延迟消息问题] by
2019-03-25 12:22:29 +0800
b4a645854
[可转增状态检查][修改]:添加检查可转增状态update_date by
2019-03-25 09:57:47 +0800
bb9d4f3f9
Merge tag 'refs/tags/jenkins-back-end-1154' into release by
2019-03-23 17:29:32 +0800
1c5111ca5
[补贴][修改]:补贴额出错问题 by
2019-03-23 17:21:27 +0800
7d4173340
Merge tag 'refs/tags/jenkins-back-end-1153' into release by
2019-03-23 17:08:40 +0800
ef59bd747
[补贴][修改]:添加补贴额打印 by
2019-03-23 16:47:54 +0800
4d4f4f0a0
[审批流][修改][租期类型改变时重新生成预账单] by
2019-03-23 16:43:27 +0800
95df572bd
[审批流][修改][租期类型改变时重新生成预账单] by
2019-03-23 16:07:29 +0800
29883624e
Merge commit 'refs/tags/jenkins-back-end-1150^{}' into release by
2019-03-23 14:03:55 +0800
bd8a40a51
[statusCheck][修改]:GET/POST都支持 by
2019-03-23 12:06:56 +0800
6d80d900f
[卡券][修改]:投放渠道不显示已经投放的券 by
2019-03-23 11:50:47 +0800
e67fb0649
[banner图更新][修改]:banner图新加券,添加券检查 by
2019-03-23 07:55:57 +0800
fbc006554
[虚拟支付][删除]:清理虚拟支付code by
2019-03-23 07:10:54 +0800
d7c96079c
Merge commit 'refs/tags/jenkins-back-end-1147^{}' into release by
2019-03-22 18:41:04 +0800
588e7ea25
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-22 18:07:57 +0800
724fec148
[营销分析][添加][优化coupon实体属性] by
2019-03-22 18:07:51 +0800
aa6214de4
[宣传页][修复]:当卡券已经作废后或者过期后不再抛出异常 by
2019-03-22 17:39:08 +0800
6b67e40bf
[宣传页][修复]:当卡券已经作废后或者过期后不再抛出异常 by
2019-03-22 17:39:08 +0800
e11f613cf
Merge remote-tracking branch 'origin/develop' into release by
2019-03-22 17:38:59 +0800
401b0f0d3
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-22 17:37:44 +0800
f89cf622a
[营销分析][添加][卡营销列表] by
2019-03-22 17:37:41 +0800
672b01623
[库存][修改]:库存退回问题 by
2019-03-22 17:36:22 +0800
e60afe75d
Merge commit 'refs/tags/jenkins-back-end-1145^{}' into release by
2019-03-22 17:31:58 +0800
df947d491
[营销分析][添加][卡营销列表] by
2019-03-22 17:23:47 +0800
9a33d38ec
[代码][优化]:修复上次提交的代码问题 by
2019-03-22 17:07:47 +0800
10767c2e3
[营销分析][添加][卡营销列表] by
2019-03-22 17:06:12 +0800
e79217012
Merge remote-tracking branch 'origin/develop' into release by
2019-03-22 16:52:13 +0800
9b932bce4
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-22 16:51:54 +0800
27602cbef
[营销分析][添加][卡营销列表] by
2019-03-22 16:51:50 +0800
284b31862
[营销分析][添加][卡营销列表] by
2019-03-22 16:51:17 +0800
c3ccc2029
[代码][优化]:删除卡券列表中一些重复的接口 by
2019-03-22 16:44:51 +0800
aac03089e
[营销分析][添加][卡营销列表] by
2019-03-22 16:35:42 +0800
8bdca31ac
Merge remote-tracking branch 'origin/develop' into release by
2019-03-22 16:06:05 +0800
0ae505d0b
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-22 16:05:34 +0800
4ada8d24c
[营销分析][添加][卡营销列表] by
2019-03-22 16:05:29 +0800
9e5b0c830
[数据塔台][修改]:检查用户是否被禁用 by
2019-03-22 15:57:45 +0800
388835211
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-22 15:56:58 +0800
430d7bcde
[营销分析][添加][卡营销列表] by
2019-03-22 15:56:52 +0800
d9b876be5
[拼团营销分析][修改][查询] by
2019-03-22 15:22:27 +0800
315767f6c
[拼团营销分析][修改][查询] by
2019-03-22 15:18:45 +0800
eb2376580
[营销分析][添加][卡营销列表] by
2019-03-22 15:12:11 +0800
35c781269
[营销分析][添加][卡营销列表] by
2019-03-22 15:03:23 +0800
209db0a38
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-22 14:48:13 +0800
dfdd920fe
[营销分析][添加][卡营销列表] by
2019-03-22 14:48:07 +0800
64fccb84b
[Status][修改]:checkUserStatus/checkPhoneStatus/getDiscountInfo post->get by
2019-03-22 12:09:57 +0800
1836d0cc2
[对账单][修改][查询] by
2019-03-22 11:45:58 +0800
07a677319
[对账单][修改][查询] by
2019-03-22 11:43:43 +0800
e5e78bd3b
Merge remote-tracking branch 'origin/develop' into release by
2019-03-22 10:57:37 +0800
ca9c2867a
[营销分析][添加][卡营销列表] by
2019-03-22 10:57:11 +0800
14c2956a2
[营销分析][添加][卡营销列表] by
2019-03-22 10:49:48 +0800
c58ca1ded
[大屏][修复]:调整生成二维码大小 by
2019-03-21 20:38:31 +0800
40be60369
[大屏][修复]:生成透明底色的二维码 by
2019-03-21 20:10:20 +0800
de8ef5164
[大屏][修复]:代码拼写错误 by
2019-03-21 18:37:40 +0800
1b028f97c
Merge remote-tracking branch 'origin/develop' into release by
2019-03-21 18:28:22 +0800
adf77d4ac
[营销分析][添加][卡营销列表] by
2019-03-21 18:07:07 +0800
8e7c4c4c0
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-21 17:54:55 +0800
9798b80e2
[营销分析][添加][卡营销列表] by
2019-03-21 17:54:51 +0800
4ba0fab4c
[大屏][修复]:更新大屏设置接口 by
2019-03-21 17:44:40 +0800
037bd8aab
Merge remote-tracking branch 'origin/develop' into develop by
2019-03-21 17:33:28 +0800
af6cf5eca
[营销分析][添加][卡营销列表] by
2019-03-21 17:33:15 +0800
368e9a1dc
[拼团营销分析][修改][查询] by
2019-03-21 17:31:28 +0800
a2f01bfbe
[EMAIL][修改]:email更新为ssl端口 by
2019-03-21 17:16:29 +0800
34524bf1d
[拼团][修改][用户删除后的记录报错] by
2019-03-21 17:12:23 +0800
70afb204c
[营销分析][添加][卡营销列表] by
2019-03-21 16:22:52 +0800
b145fec7a
[营销分析][添加][卡营销列表] by
2019-03-21 16:11:27 +0800
531d77ccb
[营销分析][添加][卡营销列表] by
2019-03-21 15:38:01 +0800