ufo / yohoufo-fore · Commits

27 Sep, 2019

6 commits

Merge branch 'dev_bid' into test6.9.13
1e7d6399

by wujiexiang
2019-09-27 14:27:34 +0800
Browse Files
求购 - 订单详情
b4478920

by wujiexiang
2019-09-27 14:27:11 +0800
Browse Files
性能优化
36e6f833

by mali
2019-09-27 11:02:40 +0800
Browse Files
性能优化
1a22d1ee

by mali
2019-09-27 10:44:27 +0800
Browse Files
求购 -- 增加订单状态
5ac01623

by wujiexiang
2019-09-27 10:34:28 +0800
Browse Files
性能优化
d5351abb

by mali
2019-09-27 10:32:08 +0800
Browse Files

26 Sep, 2019

19 commits

Merge branch 'dev_bid' into test6.9.13
d024cea2

by wujiexiang
2019-09-26 18:32:17 +0800
Browse Files
求购-数量统计
2f8561fd

by wujiexiang
2019-09-26 18:31:15 +0800
Browse Files
Merge branch 'test6.9.13' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.13
1fc8c2a8

by caoyan
2019-09-26 17:24:15 +0800
Browse Files
验签
b47f2363

by caoyan
2019-09-26 17:24:07 +0800
Browse Files
Merge branch 'dev_bid' into test6.9.13
f8a2ad68

by wujiexiang
2019-09-26 17:09:02 +0800
Browse Files
赔偿定金给卖家
8f69737c

by wujiexiang
2019-09-26 17:08:34 +0800
Browse Files
Merge branch 'dev_bid' into test6.9.13 ...
15bf5e64
```
Conflicts:
	product/src/main/java/com/yohoufo/product/service/impl/BidProductService.java
```
by wujiexiang
2019-09-26 15:49:07 +0800
Browse Files
求购变现平台服务费
757c6f5e

by wujiexiang
2019-09-26 15:38:04 +0800
Browse Files
Merge branch 'test6.9.13' of git.yoho.cn:ufo/yohoufo-fore into test6.9.13
960d6106

by 周少峰
2019-09-26 15:08:40 +0800
Browse Files
addBidInfo
8a528d09

by 周少峰
2019-09-26 15:01:55 +0800
Browse Files
闲鱼详情
f0d6b3ef

by mali
2019-09-26 14:18:04 +0800
Browse Files
求购商品状态
d9f08bb9

by wujiexiang
2019-09-26 14:15:50 +0800
Browse Files
Merge branch 'hotfix_现货寄存订单发货变更' into test6.9.13
ea3d4550

by mali
2019-09-26 11:22:10 +0800
Browse Files
Merge branch 'hotfix_现货寄存订单发货变更' of http://git.yoho.cn/ufo/yohoufo-fore into hotfix_现货寄存订单发货变更
464c4686

by caoyan
2019-09-26 11:10:31 +0800
Browse Files
寄存转现货
205b5e47

by caoyan
2019-09-26 11:10:23 +0800
Browse Files
闲鱼详情
e5b5f564

by mali
2019-09-26 10:41:34 +0800
Browse Files
闲鱼详情
cf6af91e

by mali
2019-09-26 10:21:03 +0800
Browse Files
Merge branch 'test6.9.13' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.13
b7b21c5b

by mali
2019-09-26 10:03:13 +0800
Browse Files
闲鱼详情
027b265d

by mali
2019-09-26 10:03:07 +0800
Browse Files

25 Sep, 2019

15 commits

Merge branch 'dev_bid' into test6.9.13
24bb6609

by wujiexiang
2019-09-25 18:23:00 +0800
Browse Files
求购-调价
dba19f91

by wujiexiang
2019-09-25 18:22:34 +0800
Browse Files
闲鱼详情
3eb44b3b

by mali
2019-09-25 17:41:50 +0800
Browse Files
删除配置
1887225a

by wujiexiang
2019-09-25 16:42:38 +0800
Browse Files
Merge branch 'dev_bid' into test6.9.13 ...
d3e17f78
```
Conflicts:
	order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderServiceImpl.java
```
by wujiexiang
2019-09-25 16:31:18 +0800
Browse Files
求购-定时取消
1d733a94

by wujiexiang
2019-09-25 15:30:14 +0800
Browse Files
use master version
04fb7255

by chenchao
2019-09-25 15:22:43 +0800
Browse Files
闲鱼详情
0cf663cf

by mali
2019-09-25 15:07:45 +0800
Browse Files
Merge branch 'hotfix_现货寄存订单发货变更' into test6.9.13
406d9c23

by mali
2019-09-25 15:06:13 +0800
Browse Files
校验库存
1c2b0519

by mali
2019-09-25 15:05:57 +0800
Browse Files
Merge branch 'test6.9.13' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.13
b37e3088

by mali
2019-09-25 14:53:35 +0800
Browse Files
闲鱼详情
1dd4f1ec

by mali
2019-09-25 14:53:29 +0800
Browse Files
Merge branch 'hotfix_现货寄存订单发货变更' into test6.9.13
351d9900

by caoyan
2019-09-25 13:54:59 +0800
Browse Files
寄存转现货
ac70ce18

by caoyan
2019-09-25 13:53:54 +0800
Browse Files
Merge branch 'dev_bid' into test6.9.13
df3dd64e

by wujiexiang
2019-09-25 10:07:21 +0800
Browse Files