ufo / yohoufo-fore · Commits

01 Feb, 2019

2 commits

Merge branch 'dev_批量导入' into test6.8.6
25c0de27

by chenchao
2019-02-01 09:42:35 +0800
Browse Files
no need pay
4866f4fc

by chenchao
2019-02-01 09:42:18 +0800
Browse Files

31 Jan, 2019

20 commits

fix
28a5909e

by chenchao
2019-01-31 18:55:57 +0800
Browse Files
Merge branch 'dev_批量导入' into test6.8.6
133984e8

by chenchao
2019-01-31 18:52:21 +0800
Browse Files
add sync data
87ba743a

by chenchao
2019-01-31 18:51:44 +0800
Browse Files
Merge branch 'dev_批量导入' into test6.8.6 ...
81fb685f
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/processor/SellerOrderPrepareProcessor.java
```
by chenchao
2019-01-31 15:00:30 +0800
Browse Files
batch import prd
bb0ba0fd

by chenchao
2019-01-31 14:45:58 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
84f1efe0

by qinchao
2019-01-31 13:30:36 +0800
Browse Files
fix ：发货春节后恢复成36小时，加上线时间节点判断2
5a1ee614

by qinchao
2019-01-31 13:30:23 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
7a55dd09

by qinchao
2019-01-31 13:05:48 +0800
Browse Files
fix ：发货春节后恢复成36小时，加上线时间节点判断
a9145c13

by qinchao
2019-01-31 13:04:54 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
ab160abf

by qinchao
2019-01-31 11:34:36 +0800
Browse Files
fix ：发货春节后恢复成36小时
b12b6c84

by qinchao
2019-01-31 11:32:10 +0800
Browse Files
support batch process
13804dec

by chenchao
2019-01-31 11:16:00 +0800
Browse Files
Merge branch 'gray' into test6.8.6
5c61fc1f

by mali
2019-01-31 11:03:53 +0800
Browse Files
编译问题
0327fe05

by mali
2019-01-31 10:34:23 +0800
Browse Files
Merge branch 'dev_缓存key' into test6.8.6
e8a80b7c

by Lixiaodi
2019-01-31 10:27:22 +0800
Browse Files
缓存key修改
762cc5cb

by Lixiaodi
2019-01-31 10:27:11 +0800
Browse Files
Merge branch 'test6.8.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.6
bfccdfce

by Lixiaodi
2019-01-31 10:24:42 +0800
Browse Files
预售
43c3b74f

by Lixiaodi
2019-01-31 10:24:34 +0800
Browse Files
定时发货
48bf7932

by mali
2019-01-31 10:22:01 +0800
Browse Files
定时发货
3c881ec5

by mali
2019-01-31 09:59:19 +0800
Browse Files

30 Jan, 2019

16 commits

1. batch import ...
0a3f9cee
```
2. check seller is normal super
```
by chenchao
2019-01-30 20:53:50 +0800
Browse Files
Merge branch 'gray' into test6.8.6
20a48ef1

by mali
2019-01-30 20:51:05 +0800
Browse Files
Merge branch 'master' into gray
33eace37

by mali
2019-01-30 19:14:18 +0800
Browse Files
缓存key问题
e7c53b3e

by mali
2019-01-30 19:14:05 +0800
Browse Files
定时发货
a0f92eb1

by mali
2019-01-30 19:12:57 +0800
Browse Files
Merge branch 'dev_限价隐藏提示'
8a10de5c

by mali
2019-01-30 17:59:52 +0800
Browse Files
定时发货
bdca722a

by mali
2019-01-30 17:59:31 +0800
Browse Files
add isAdvance
9e496c9b

by chenchao
2019-01-30 15:14:03 +0800
Browse Files
瑕疵等级扣费：超级卖家
2e71da09

by qinchao
2019-01-30 15:06:48 +0800
Browse Files
瑕疵等级扣费：超级卖家
01e5f156

by qinchao
2019-01-30 14:32:38 +0800
Browse Files
瑕疵等级扣费
9940887f

by qinchao
2019-01-30 13:29:25 +0800
Browse Files
group by attributes
266d67d5

by chenchao
2019-01-30 11:51:52 +0800
Browse Files
瑕疵等级扣费
ee87c2be

by qinchao
2019-01-30 11:38:44 +0800
Browse Files
Merge branch 'test6.8.6' into dev_order_6.8.6
813fadc8

by chenchao
2019-01-30 11:24:49 +0800
Browse Files
save one new goods of seller with skup-type
7668f3cf

by chenchao
2019-01-30 10:49:15 +0800
Browse Files
惩罚添加一个码：35
5b868e08

by qinchao
2019-01-30 09:56:58 +0800
Browse Files

29 Jan, 2019

2 commits

Merge branch 'hotfix_0128_mqtime' into test6.8.6
88873811

by qinchao
2019-01-29 20:59:21 +0800
Browse Files
fix
f985296c

by qinchao
2019-01-29 19:46:21 +0800
Browse Files