ufo / yohoufo-fore · Commits

29 Sep, 2018

30 commits

use value
4435529b

by sailing-PC\sailing
2018-09-29 16:43:44 +0800
Browse Files
fix
210f6236

by sailing-PC\sailing
2018-09-29 16:17:13 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore ...
f7d090e2
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/proxy/ProductProxyService.java
```
by sailing-PC\sailing
2018-09-29 16:15:35 +0800
Browse Files
fix
301f9b37

by sailing-PC\sailing
2018-09-29 16:11:59 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
7dd6fbfa

by mali
2018-09-29 16:03:30 +0800
Browse Files
取消订单接口
beb1bf6c

by mali
2018-09-29 16:03:17 +0800
Browse Files
我的资产接口
d7d1fde8

by qinchao
2018-09-29 16:02:23 +0800
Browse Files
取消订单接口
785e077b

by mali
2018-09-29 15:59:33 +0800
Browse Files
支付宝验签加上
c9096754

by mali
2018-09-29 14:56:16 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
f0eda200

by mali
2018-09-29 14:54:29 +0800
Browse Files
可以删除的订单状态
8d7da171

by mali
2018-09-29 14:54:16 +0800
Browse Files
修复问题
59c83df0

by qinchao
2018-09-29 14:53:43 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
a8c040da

by mali
2018-09-29 13:52:13 +0800
Browse Files
order list : 1. order by time desc 2. add create time ...
2f0ca6ea
```
order detail : 1. add pay tips in seller order 2. add create time
```
by sailing-PC\sailing
2018-09-29 13:49:36 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
e0539356

by Lixiaodi
2018-09-29 13:41:38 +0800
Browse Files
bug修改
64f638c2

by Lixiaodi
2018-09-29 13:41:26 +0800
Browse Files
更新接口
a70c6a5e

by qinchao
2018-09-29 13:34:16 +0800
Browse Files
add config
70bb3d8a

by sailing-PC\sailing
2018-09-29 11:53:04 +0800
Browse Files
Merge branch 'master' into dev
987f138a

by mali
2018-09-29 11:06:30 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
702f5135

by Lixiaodi
2018-09-29 10:58:05 +0800
Browse Files
修改微信回调bug
ef55d6d3

by Lixiaodi
2018-09-29 10:57:54 +0800
Browse Files
Merge branch 'dev'
153091b4

by sailing-PC\sailing
2018-09-29 10:57:48 +0800
Browse Files
fix
b01da195

by sailing-PC\sailing
2018-09-29 10:57:20 +0800
Browse Files
Merge branch 'dev'
ddc737ae

by mali
2018-09-29 10:33:20 +0800
Browse Files
日志
9a209329

by mali
2018-09-29 10:32:49 +0800
Browse Files
修改修改微信验证
f66b3af3

by Lixiaodi
2018-09-29 10:31:49 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
3f8d9ad1

by Lixiaodi
2018-09-29 10:28:30 +0800
Browse Files
修改支付宝验证
a09271d8

by Lixiaodi
2018-09-29 10:27:59 +0800
Browse Files
Merge branch 'master' into dev
dbc595c4

by sailing-PC\sailing
2018-09-29 10:14:49 +0800
Browse Files
fix sync skup status after paid
8c27c56b

by sailing-PC\sailing
2018-09-29 10:14:19 +0800
Browse Files

28 Sep, 2018

10 commits

支付回调
e956a54d

by mali
2018-09-28 21:47:37 +0800
Browse Files
先干掉秘钥验证
8c3eb0d3

by mali
2018-09-28 21:41:20 +0800
Browse Files
先干掉秘钥验证
d5531104

by mali
2018-09-28 21:14:21 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
79865402

by mali
2018-09-28 21:06:20 +0800
Browse Files
支付回调
1356a21a

by mali
2018-09-28 21:06:07 +0800
Browse Files
add frame
35bf1c91

by sailing-PC\sailing
2018-09-28 21:03:50 +0800
Browse Files
支付回调
d9052763

by mali
2018-09-28 20:32:27 +0800
Browse Files
测试代码
e93c4470

by mali
2018-09-28 19:39:18 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
82237d81

by mali
2018-09-28 19:12:32 +0800
Browse Files
测试代码
4d405886

by mali
2018-09-28 19:12:26 +0800
Browse Files