ufo / yohoufo-fore · Commits

15 Feb, 2019

16 commits

Merge branch 'dev_物权转移' into test6.8.6
cad6618c

by caoyan
2019-02-15 17:20:20 +0800
Browse Files
物权转移
a2dcc228

by caoyan
2019-02-15 17:15:31 +0800
Browse Files
Merge branch 'dev_order_6.8.6' into test6.8.6
378cc20e

by chenchao
2019-02-15 16:27:17 +0800
Browse Files
fix sync product data
608b3923

by chenchao
2019-02-15 16:27:00 +0800
Browse Files
Merge branch 'dev_limit_sale0214' into test6.8.6
59eea191

by Lixiaodi
2019-02-15 16:12:42 +0800
Browse Files
默认商品值
30c13cac

by Lixiaodi
2019-02-15 16:12:16 +0800
Browse Files
Merge branch 'test6.8.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.6
5d4db8fb

by Lixiaodi
2019-02-15 15:45:43 +0800
Browse Files
增加属性tostring
e8d8b27e

by Lixiaodi
2019-02-15 15:45:30 +0800
Browse Files
Merge branch 'test6.8.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.6
bc42c94d

by chenchao
2019-02-15 14:43:42 +0800
Browse Files
Merge branch 'dev_order_6.8.6' into test6.8.6
55298634

by chenchao
2019-02-15 14:43:30 +0800
Browse Files
bug修改
df0a58b6

by Lixiaodi
2019-02-15 14:43:19 +0800
Browse Files
fix skup type transfer missed
76236574

by chenchao
2019-02-15 14:43:13 +0800
Browse Files
提供批量查询是否收藏商品的接口（提供给种草）
9daa7a4c

by 张帅
2019-02-15 12:41:05 +0800
Browse Files
Merge branch 'dev_order_6.8.6' into test6.8.6
a694bfaf

by chenchao
2019-02-15 11:33:34 +0800
Browse Files
add isAdvance 4 response BO of list and detail
c358fd4a

by chenchao
2019-02-15 11:33:22 +0800
Browse Files
去掉不用的consumer （春节期间120小时发货）
48297037

by qinchao
2019-02-15 09:45:59 +0800
Browse Files

14 Feb, 2019

14 commits

预售bug修改
bc553ff2

by Lixiaodi
2019-02-14 17:55:14 +0800
Browse Files
Merge branch 'dev_limit_sale0214' into test6.8.6
69776c65

by Lixiaodi
2019-02-14 17:43:12 +0800
Browse Files
限制销售商品
0436e14d

by Lixiaodi
2019-02-14 17:42:46 +0800
Browse Files
Merge branch 'test6.8.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.6
a1530621

by Lixiaodi
2019-02-14 17:06:18 +0800
Browse Files
Merge branch 'dev_limit_sale0214' into test6.8.6
b4793100

by Lixiaodi
2019-02-14 17:05:19 +0800
Browse Files
限制销售商品
8ebc1ae8

by Lixiaodi
2019-02-14 16:53:58 +0800
Browse Files
Merge branch 'hotfix_修复超级卖家的升级前保证金问题' into test6.8.6 ...
8419c893
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/PayRefundService.java
```
by chenchao
2019-02-14 16:19:10 +0800
Browse Files
fix：卖家从个人卖家升级到超级后操作之前订单，不退还保证金
5f5b8538

by chenchao
2019-02-14 16:16:50 +0800
Browse Files
fix params of doc
b9672b4d

by chenchao
2019-02-14 15:03:07 +0800
Browse Files
Merge branch 'master' into test6.8.6 ...
a8f199c3
```
Conflicts:
	web/src/main/resources/global.properties
```
by mali
2019-02-14 14:24:39 +0800
Browse Files
发货超时时间修改为36小时
099644c1

by mali
2019-02-14 14:23:48 +0800
Browse Files
Merge branch 'hotfix_超时' into gray
8749a47b

by mali
2019-02-14 10:30:43 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
275a1f2a

by qinchao
2019-02-14 10:20:56 +0800
Browse Files
修改默认的生效时间为2月15凌晨
d67d4587

by qinchao
2019-02-14 10:09:55 +0800
Browse Files

13 Feb, 2019

10 commits

Merge branch 'dev_物权转移' into test6.8.6
5cb43a98

by caoyan
2019-02-13 17:00:41 +0800
Browse Files
物权转移
46cd7a06

by caoyan
2019-02-13 17:00:23 +0800
Browse Files
Merge branch 'dev-grass-0108' into test6.8.6
16917cc8

by 张帅
2019-02-13 16:38:08 +0800
Browse Files
提供接口_种草相关
609f60bf

by 张帅
2019-02-13 16:37:27 +0800
Browse Files
物权转移
7966834b

by caoyan
2019-02-13 16:11:48 +0800
Browse Files
支持再次入驻
5738f450

by Lixiaodi
2019-02-13 15:13:15 +0800
Browse Files
支持再次入驻
0f10a9ff

by Lixiaodi
2019-02-13 15:09:18 +0800
Browse Files
Merge branch 'dev_物权转移' into test6.8.6
e9133496

by caoyan
2019-02-13 10:05:45 +0800
Browse Files
物权转移
58d8d737

by caoyan
2019-02-13 10:05:26 +0800
Browse Files
预售价
9be23270

by Lixiaodi
2019-02-13 09:57:12 +0800
Browse Files