ufo / yohoufo-fore · Commits

13 Mar, 2019

6 commits

保留瑕疵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

09 Mar, 2019

13 commits

Merge branch 'dev6.8.6.5-quality4app' into test6.8.6.5
131467d4

by caoyan
2019-03-09 18:14:54 +0800
Browse Files
物权转移
c0f1afbf

by caoyan
2019-03-09 18:14:41 +0800
Browse Files
Merge branch 'dev6.8.6.5-quality4app' into test6.8.6.5
cfd40cdb

by caoyan
2019-03-09 17:22:55 +0800
Browse Files
物权转移
298db077

by caoyan
2019-03-09 17:22:46 +0800
Browse Files
Merge branch 'dev6.8.6.5-quality4app' into test6.8.6.5 ...
f2fee490
```
# Conflicts:
#	product/src/main/java/com/yohoufo/product/service/impl/ProductIdentifyServiceImpl.java
```
by caoyan
2019-03-09 17:15:16 +0800
Browse Files
物权转移
1c5d199b

by caoyan
2019-03-09 17:12:38 +0800
Browse Files
物权转移
8bbf4bdd

by caoyan
2019-03-09 14:50:56 +0800
Browse Files
Revert "测试时间：瑕疵确认时间" ...
83c899e7
```
This reverts commit 7321c103.
```
by qinchao
2019-03-09 14:14:35 +0800
Browse Files
Merge branch 'dev6.8.6.5-quality4app' into test6.8.6.5
f5426c69

by caoyan
2019-03-09 14:02:00 +0800
Browse Files
物权转移
e1665e84

by caoyan
2019-03-09 14:01:48 +0800
Browse Files
测试时间：瑕疵确认时间
7321c103

by qinchao
2019-03-09 13:45:59 +0800
Browse Files
Merge branch 'master' into test6.8.6.5
1903ab3f

by mali
2019-03-09 11:11:49 +0800
Browse Files
Merge branch 'gray' into test6.8.6.5
632776e6

by mali
2019-03-09 11:11:27 +0800
Browse Files

08 Mar, 2019

2 commits

Merge branch 'master' into hotfix_线上线下订单号隔离
c4cea8d3

by chenchao
2019-03-08 15:26:11 +0800
Browse Files
短信文案
756a657d

by qinchao
2019-03-08 15:11:45 +0800
Browse Files