ufo / yohoufo-fore · Commits

25 Sep, 2018

15 commits

Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev ...
1f5aeaf1
```
* 'dev' of http://git.yoho.cn/ufo/yohoufo-fore:
  增加orika依赖
```
by zhaojun2
2018-09-25 16:43:48 +0800
Browse Files
add poolid sort
6d08dc7b

by zhaojun2
2018-09-25 16:43:32 +0800
Browse Files
Merge remote-tracking branch 'origin/dev' into dev
fc753069

by kun
2018-09-25 16:39:45 +0800
Browse Files
增加orika依赖
4f26c947

by kun
2018-09-25 16:39:37 +0800
Browse Files
Merge branch 'master' into dev
2dc55b5b

by sailing-PC\sailing
2018-09-25 16:38:20 +0800
Browse Files
update some
e8982c99

by sailing-PC\sailing
2018-09-25 16:32:13 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
70ecc395

by csgyoho
2018-09-25 15:43:43 +0800
Browse Files
完善inboxsdk
e3eb2467

by csgyoho
2018-09-25 15:43:31 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
91c9abf9

by tanling
2018-09-25 14:15:06 +0800
Browse Files
订单
41bf04a9

by tanling
2018-09-25 14:15:01 +0800
Browse Files
修改接口
2d072e0c

by qinchao
2018-09-25 13:33:30 +0800
Browse Files
修改log
624afa0e

by Lixiaodi
2018-09-25 11:22:28 +0800
Browse Files
add id search
a7233543

by zhaojun2
2018-09-25 11:05:14 +0800
Browse Files
no message
73b49ccf

by csgyoho
2018-09-25 09:56:59 +0800
Browse Files
获取签名密钥接口
3c42a955

by csgyoho
2018-09-25 09:41:38 +0800
Browse Files

22 Sep, 2018

1 commit

Merge branch 'dev'
6a17c629

by mali
2018-09-22 21:25:15 +0800
Browse Files

21 Sep, 2018

24 commits

支付
868b6fa3

by tanling
2018-09-21 20:12:37 +0800
Browse Files
增加下单失败状态
68086451

by Lixiaodi
2018-09-21 18:55:00 +0800
Browse Files
修改商品交易接口
facc8917

by Lixiaodi
2018-09-21 18:36:54 +0800
Browse Files
Merge branch 'master' into dev
c8318ecc

by sailing-PC\sailing
2018-09-21 18:35:21 +0800
Browse Files
fix
a416e3a7

by sailing-PC\sailing
2018-09-21 18:33:11 +0800
Browse Files
no message
5aa158e1

by tanling
2018-09-21 18:29:22 +0800
Browse Files
下单
da7667f4

by tanling
2018-09-21 17:57:00 +0800
Browse Files
add sync prd
39ee92cb

by sailing-PC\sailing
2018-09-21 17:55:27 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
394e35e9

by tanling
2018-09-21 17:30:39 +0800
Browse Files
支付
eaa52a4d

by tanling
2018-09-21 17:30:33 +0800
Browse Files
日志整改
162454fa

by mali
2018-09-21 17:26:28 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
71fa59c2

by csgyoho
2018-09-21 17:17:52 +0800
Browse Files
no message
789a2c3b

by csgyoho
2018-09-21 17:17:44 +0800
Browse Files
no message
c15892c4

by tanling
2018-09-21 17:12:39 +0800
Browse Files
no message
5105a2ef

by tanling
2018-09-21 17:09:43 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
3df1d5bc

by tanling
2018-09-21 16:14:48 +0800
Browse Files
订单
2a944251

by tanling
2018-09-21 16:14:43 +0800
Browse Files
Merge branch 'dev'
a4246321

by mali
2018-09-21 16:10:51 +0800
Browse Files
add address 4 buyer
efb24213

by sailing-PC\sailing
2018-09-21 15:04:20 +0800
Browse Files
no message
17232813

by tanling
2018-09-21 15:03:42 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore ...
4baff50f
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/IPaymentService.java
#	order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
```
by tanling
2018-09-21 15:02:23 +0800
Browse Files
支付相关
129f1132

by tanling
2018-09-21 15:00:51 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
f4fd7aba

by Lixiaodi
2018-09-21 14:30:42 +0800
Browse Files
bug修改
392a4bf8

by Lixiaodi
2018-09-21 14:30:33 +0800
Browse Files