ufo / yohoufo-fore · Commits

25 Jul, 2019

2 commits

Merge branch 'test6.9.9' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.9
17d9f0d7

by tanling
2019-07-25 11:32:53 +0800
Browse Files
跨境支付
86061841

by tanling
2019-07-25 11:32:49 +0800
Browse Files

24 Jul, 2019

30 commits

select optimized goods service rate
97dc8ecf

by chenchao
2019-07-24 19:13:44 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
0e1e713b

by wujiexiang
2019-07-24 18:34:46 +0800
Browse Files
重试
030a7d09

by wujiexiang
2019-07-24 18:34:18 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
e7f292ca

by wujiexiang
2019-07-24 18:01:22 +0800
Browse Files
fixbug NullException
facd5e73

by wujiexiang
2019-07-24 18:01:10 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
1d25f955

by wujiexiang
2019-07-24 17:04:09 +0800
Browse Files
根据skup_type统计
b3f377c9

by wujiexiang
2019-07-24 17:02:28 +0800
Browse Files
支付列表
b7774beb

by tanling
2019-07-24 16:54:45 +0800
Browse Files
支付列表
50544585

by tanling
2019-07-24 16:36:59 +0800
Browse Files
Merge branch 'test6.9.9' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.9
617d3f80

by tanling
2019-07-24 16:12:50 +0800
Browse Files
订单类型
42a1ecf8

by tanling
2019-07-24 16:12:46 +0800
Browse Files
Merge branch 'test6.9.9' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.9
6f3e3291

by mali
2019-07-24 15:53:12 +0800
Browse Files
寄存二期
1990299a

by mali
2019-07-24 15:53:08 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
0c352aa4

by wujiexiang
2019-07-24 15:47:01 +0800
Browse Files
日志修改
4c13948f

by wujiexiang
2019-07-24 15:46:31 +0800
Browse Files
add new api 4 auto recommeded
cda26f41

by chenchao
2019-07-24 15:35:41 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
3a1088ae

by wujiexiang
2019-07-24 14:31:30 +0800
Browse Files
统计添加更新时间
688d1bf6

by wujiexiang
2019-07-24 14:29:59 +0800
Browse Files
support off shelve seller goods by skup
6929fd02

by chenchao
2019-07-24 11:47:54 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
c26bdbc2

by wujiexiang
2019-07-24 11:17:26 +0800
Browse Files
卖家技术服务费扣点接口
17634a6d

by wujiexiang
2019-07-24 11:17:12 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore into dev-seller-order-stat-6.9.9
16decb97

by wujiexiang
2019-07-24 10:53:18 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
a629bca9

by wujiexiang
2019-07-24 10:51:15 +0800
Browse Files
append log
34c63297

by wujiexiang
2019-07-24 10:50:52 +0800
Browse Files
Merge branch 'hotfix_0724' into test6.9.9 ...
0d5bb449
```
Conflicts:
	order/src/main/java/com/yohoufo/order/service/deposit/DepositOrderService.java
```
by mali
2019-07-24 10:34:54 +0800
Browse Files
获取召回地址
2602832f

by mali
2019-07-24 10:34:00 +0800
Browse Files
Merge branch 'test6.9.9' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.9
774f0937

by mali
2019-07-24 10:22:20 +0800
Browse Files
寄存二期
fa51b7e5

by mali
2019-07-24 10:22:16 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
497a5180

by wujiexiang
2019-07-24 10:11:12 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore into dev-seller-order-stat-6.9.9 ...
7b1ae7a1
```
Conflicts:
	order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
```
by wujiexiang
2019-07-24 10:10:21 +0800
Browse Files

23 Jul, 2019

8 commits

use optimize coupon
8deec2b4

by chenchao
2019-07-23 19:09:38 +0800
Browse Files
Merge branch 'master' into test6.9.9
e8a89729

by mali
2019-07-23 19:02:40 +0800
Browse Files
Merge branch 'dev-seller-order-stat-6.9.9' into test6.9.9
d84b6812

by wujiexiang
2019-07-23 18:40:06 +0800
Browse Files
fixbug
9a7e261b

by LUOXC
2019-07-23 18:39:33 +0800
Browse Files
卖家技术服务费阶梯扣点
484c9013

by wujiexiang
2019-07-23 18:39:15 +0800
Browse Files
寄存二期
42492a8d

by mali
2019-07-23 18:34:37 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore into dev-seller-order-stat-6.9.9
46885ce6

by wujiexiang
2019-07-23 18:23:32 +0800
Browse Files
Merge branch 'hotfix-20190723' into test6.9.9 ...
2ed4f558
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
```
by LUOXC
2019-07-23 18:07:06 +0800
Browse Files