ufo / yohoufo-fore · Commits

15 Mar, 2019

9 commits

支付超过100万转账修改
642273eb

by Lixiaodi
2019-03-15 20:11:01 +0800
Browse Files
bug修改
8a5e43c8

by Lixiaodi
2019-03-15 19:27:53 +0800
Browse Files
支付超过100万转账修改
c9b9e77b

by Lixiaodi
2019-03-15 18:48:43 +0800
Browse Files
修改转账调用阿里网址
6ea500a0

by Lixiaodi
2019-03-15 16:27:44 +0800
Browse Files
人工转账后修改状态
7f29ad6c

by Lixiaodi
2019-03-15 14:55:19 +0800
Browse Files
人工转账后修改状态
49d59bff

by Lixiaodi
2019-03-15 14:50:49 +0800
Browse Files
Merge branch 'test6.8.7' into dev_pay_million
05937cd2

by Lixiaodi
2019-03-15 14:21:29 +0800
Browse Files
配置开关
752c566a

by Lixiaodi
2019-03-15 14:13:20 +0800
Browse Files
恢复缓存
68818fda

by Lixiaodi
2019-03-15 09:49:27 +0800
Browse Files

14 Mar, 2019

4 commits

支付超过100万转账修改
4c01edf6

by Lixiaodi
2019-03-14 18:15:05 +0800
Browse Files
Merge branch 'test6.8.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.7
01d09e5d

by Lixiaodi
2019-03-14 16:39:42 +0800
Browse Files
热搜列表加销量，暂时去掉缓存
be14ae63

by Lixiaodi
2019-03-14 16:39:20 +0800
Browse Files
支付超过100万修改
1967297b

by Lixiaodi
2019-03-14 16:32:55 +0800
Browse Files

13 Mar, 2019

8 commits

Revert "测试mq时间" ...
f744fe7c
```
This reverts commit ada9a643.
```
by qinchao
2019-03-13 16:19:53 +0800
Browse Files
测试mq时间
ada9a643

by qinchao
2019-03-13 16:09:16 +0800
Browse Files
保留瑕疵24小时的consumer，处理老数据
1210e931

by qinchao
2019-03-13 15:51:20 +0800
Browse Files
Merge branch 'test6.8.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.7
2dbe6120

by qinchao
2019-03-13 14:25:45 +0800
Browse Files
Revert "测试mq时间" ...
7916d88a
```
This reverts commit f6b88872.
```
by qinchao
2019-03-13 14:25:32 +0800
Browse Files
Merge branch 'dev_修改结算页提示' into test6.8.7
9686717e

by chenchao
2019-03-13 14:23:50 +0800
Browse Files
update new words as tips
de1398c2

by chenchao
2019-03-13 14:22:09 +0800
Browse Files
测试mq时间
f6b88872

by qinchao
2019-03-13 14:09:09 +0800
Browse Files

12 Mar, 2019

6 commits

修改log
90db044d

by Lixiaodi
2019-03-12 18:51:14 +0800
Browse Files
Revert "seller compute product fee and rate dependency config of product & user relationship" ...
8f99e478
```
This reverts commit 35201050.
```
by chenchao
2019-03-12 18:37:17 +0800
Browse Files
Merge branch 'dev_6.8.7_order_出售权限' into test6.8.7
9ed0261d

by chenchao
2019-03-12 18:07:12 +0800
Browse Files
seller compute product fee and rate dependency config of product & user relationship
35201050

by chenchao
2019-03-12 18:06:29 +0800
Browse Files
商品增加销量信息
322c4281

by Lixiaodi
2019-03-12 15:30:40 +0800
Browse Files
商品增加销量信息
10383285

by Lixiaodi
2019-03-12 14:35:46 +0800
Browse Files

11 Mar, 2019

11 commits

Merge branch 'master' into test6.8.7
718383dd

by mali
2019-03-11 18:14:23 +0800
Browse Files
Merge branch 'hotfix_线上线下订单号隔离' into test6.8.6.5 ...
d1207892
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/support/codegenerator/populater/AtomicIdPopulator.java
```
by chenchao
2019-03-11 17:51:54 +0800
Browse Files
use database config control sequence of order code
73c42531

by chenchao
2019-03-11 17:47:47 +0800
Browse Files
超时取消退券
3f87021a

by chenjian
2019-03-11 15:33:31 +0800
Browse Files
详情页缓存时间改成120秒
9f9014a5

by mali
2019-03-11 15:18:49 +0800
Browse Files
Merge branch 'dev_687_更新瑕疵确认时间为48' into test6.8.7
8291718b

by qinchao
2019-03-11 11:11:03 +0800
Browse Files
fix
082c1b26

by qinchao
2019-03-11 11:10:50 +0800
Browse Files
Merge branch 'test6.8.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.7
431d2ad7

by Lixiaodi
2019-03-11 11:02:22 +0800
Browse Files
bug修改
60ed68f7

by Lixiaodi
2019-03-11 11:02:11 +0800
Browse Files
Merge branch 'dev_687_物流手机号脱敏' into test6.8.7
c8f28f92

by qinchao
2019-03-11 10:08:56 +0800
Browse Files
Merge branch 'dev_687_更新瑕疵确认时间为48' into test6.8.7 ...
8da4882e
```
# Conflicts:
#	web/src/main/webapp/META-INF/autoconf/rabbitmq.yml
```
by qinchao
2019-03-11 10:07:55 +0800
Browse Files

10 Mar, 2019

2 commits

Merge branch 'test6.8.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.7
ac437081

by mali
2019-03-10 11:58:41 +0800
Browse Files
Merge branch 'gray' into test6.8.7
eaba2283

by mali
2019-03-10 11:58:37 +0800
Browse Files