ufo / yohoufo-fore · Commits

11 Jul, 2019

18 commits

Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8 ...
7a8f1534
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/mq/consumer/DepositFinishDeliveryDelayMsgConsumer.java
#	order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
```
by caoyan
2019-07-11 14:23:49 +0800
Browse Files
寄存
93ea6801

by caoyan
2019-07-11 14:21:11 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
07a408a3

by Lixiaodi
2019-07-11 14:18:51 +0800
Browse Files
缓存清理
0e7e7627

by Lixiaodi
2019-07-11 14:18:41 +0800
Browse Files
add new prop load value
88660d24

by chenchao
2019-07-11 14:17:45 +0800
Browse Files
编译
2db0cef3

by mali
2019-07-11 13:37:31 +0800
Browse Files
编译
50329b2b

by mali
2019-07-11 13:25:10 +0800
Browse Files
编译
a6da99f0

by mali
2019-07-11 13:01:35 +0800
Browse Files
编译
80ea4404

by mali
2019-07-11 12:39:44 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
efb94035

by mali
2019-07-11 11:29:11 +0800
Browse Files
编译
ebe78c6b

by mali
2019-07-11 11:29:07 +0800
Browse Files
fix skup type 4 product
6740755f

by chenchao
2019-07-11 11:13:18 +0800
Browse Files
fix quick deliver not show
8475db5d

by chenchao
2019-07-11 11:10:01 +0800
Browse Files
编译
7fb6bc36

by mali
2019-07-11 11:05:25 +0800
Browse Files
编译
3d818b6f

by mali
2019-07-11 11:04:54 +0800
Browse Files
闪购
3863be39

by Lixiaodi
2019-07-11 09:42:17 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
46ac2ca8

by caoyan
2019-07-11 09:36:02 +0800
Browse Files
寄存
9cfe1385

by caoyan
2019-07-11 09:35:53 +0800
Browse Files

10 Jul, 2019

22 commits

Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
49e61d54

by mali
2019-07-10 21:38:51 +0800
Browse Files
召回试算接口
034147fa

by mali
2019-07-10 21:38:46 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
ce44955a

by chenchao
2019-07-10 21:37:17 +0800
Browse Files
fix
a95f1d87

by chenchao
2019-07-10 21:36:04 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
4a2595b1

by mali
2019-07-10 21:16:59 +0800
Browse Files
召回试算接口
645742dd

by mali
2019-07-10 21:16:50 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
f971cc7b

by chenchao
2019-07-10 21:14:48 +0800
Browse Files
use off
7cd6f413

by chenchao
2019-07-10 21:14:41 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
34b4480b

by mali
2019-07-10 20:47:12 +0800
Browse Files
仓库订单
ba6b1bb8

by mali
2019-07-10 20:47:09 +0800
Browse Files
@RequestParam(name="address_id", required = false)String addressId
011023d5

by 马力
2019-07-10 20:46:33 +0800
Browse Files
fix null point
364fa547

by chenchao
2019-07-10 20:26:53 +0800
Browse Files
仓库列表接口
51b5a804

by mali
2019-07-10 20:11:36 +0800
Browse Files
仓库列表接口
3b961d13

by mali
2019-07-10 20:08:44 +0800
Browse Files
off shelve ...
d9bb8190
```
publish bug
```
by chenchao
2019-07-10 18:52:20 +0800
Browse Files
support update address when recall deposit product
e6246e82

by chenchao
2019-07-10 18:32:28 +0800
Browse Files
Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8
91a9be8f

by mali
2019-07-10 18:19:27 +0800
Browse Files
防并发操作
4e8d0fa1

by mali
2019-07-10 18:18:52 +0800
Browse Files
support query shipfee by user address
c5971f30

by chenchao
2019-07-10 17:39:12 +0800
Browse Files
转卖代码
e22ab7f6

by Lixiaodi
2019-07-10 17:28:33 +0800
Browse Files
split a big class 2 smaller
d586d771

by chenchao
2019-07-10 17:16:25 +0800
Browse Files
deposit order requried special depot type ...
b816c5dc
```
buyer order use areacode to routing ship fee
```
by chenchao
2019-07-10 16:10:42 +0800
Browse Files