ufo / yohoufo-fore · Commits

26 Jun, 2019

19 commits

加注释
edefcdca

by qinchao
2019-06-26 16:56:31 +0800
Browse Files
fix bug
01576fa1

by qinchao
2019-06-26 16:44:25 +0800
Browse Files
清关数据保存
36406577

by qinchao
2019-06-26 16:39:45 +0800
Browse Files
bug修改
12303dd2

by Lixiaodi
2019-06-26 16:06:27 +0800
Browse Files
add log
d488c99a

by chenchao
2019-06-26 16:00:42 +0800
Browse Files
overseas order no need auto confirm
644f4aa6

by chenchao
2019-06-26 15:09:50 +0800
Browse Files
fix
ab9c4a21

by chenchao
2019-06-26 14:50:03 +0800
Browse Files
重新上架现货、二手类型
aac1954b

by qinchao
2019-06-26 14:34:22 +0800
Browse Files
fix bug
566913cf

by LUOXC
2019-06-26 14:12:40 +0800
Browse Files
fix import class path com.yoho.tools.common.beans
52ec8ae5

by chenchao
2019-06-26 13:04:26 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
fee3fba1

by LUOXC
2019-06-26 11:44:46 +0800
Browse Files
fix bug
6e3278d6

by LUOXC
2019-06-26 11:44:09 +0800
Browse Files
Merge branch 'hotfix_质检app' into test6.9.7
de6c3e4e

by mali
2019-06-26 11:43:33 +0800
Browse Files
质检app增加虚假发货寄回的场景
10ca07b2

by mali
2019-06-26 11:43:27 +0800
Browse Files
Merge branch 'hotfix_质检app' into test6.9.7
93438471

by mali
2019-06-26 11:11:41 +0800
Browse Files
质检app增加虚假发货寄回的场景
f05a6330

by mali
2019-06-26 11:11:34 +0800
Browse Files
fix log
5509747b

by qinchao
2019-06-26 10:58:14 +0800
Browse Files
Revert "发货超时，test" ...
91d826b7
```
This reverts commit fa26185b.
```
by qinchao
2019-06-26 10:45:04 +0800
Browse Files
发货超时，test
fa26185b

by qinchao
2019-06-26 10:10:53 +0800
Browse Files

25 Jun, 2019

15 commits

Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
5863f86c

by chenchao
2019-06-25 19:07:40 +0800
Browse Files
fastjson can not re-seri
f0a2fe2a

by chenchao
2019-06-25 19:06:54 +0800
Browse Files
增加 todo
e89ce9f5

by qinchao
2019-06-25 18:33:41 +0800
Browse Files
Merge branch 'hotfix_出售接口入参控制'
5b1f178b

by chenchao
2019-06-25 17:50:46 +0800
Browse Files
calculate tariff amount by using initial price
2943ae71

by chenchao
2019-06-25 17:46:19 +0800
Browse Files
二手获取支付时间bug
d114c2fe

by mali
2019-06-25 16:25:46 +0800
Browse Files
Merge branch 'hotfix_出售接口入参控制' into test6.9.7 ...
7c377d1c
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderService.java
```
by chenchao
2019-06-25 15:58:32 +0800
Browse Files
check real name 4 order of overseas goods when submit
b13cb832

by chenchao
2019-06-25 15:48:43 +0800
Browse Files
Merge branch 'master' into test6.9.7
6d787383

by mali
2019-06-25 15:44:34 +0800
Browse Files
二手详情售出时间
916e0e47

by mali
2019-06-25 15:39:56 +0800
Browse Files
protect skup type in special api
dc992ce0

by chenchao
2019-06-25 15:27:34 +0800
Browse Files
remove cancel button of paid overseas order
b2748e49

by chenchao
2019-06-25 14:06:29 +0800
Browse Files
fix bug
9885f9a5

by LUOXC
2019-06-25 09:46:51 +0800
Browse Files
add error
ed394e05

by LUOXC
2019-06-25 09:27:07 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
fad2e4a1

by LUOXC
2019-06-25 09:19:11 +0800
Browse Files

24 Jun, 2019

6 commits

buy order support tariff
1475d359

by chenchao
2019-06-24 20:25:03 +0800
Browse Files
Merge branch 'dev6.9.7' into test6.9.7 ...
e74c26d3
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
```
by LUOXC
2019-06-24 18:23:45 +0800
Browse Files
增加 Todo
8fc72886

by qinchao
2019-06-24 14:26:00 +0800
Browse Files
refund coupons use async method
53784a80

by chenchao
2019-06-24 11:29:34 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
e6f2dd3d

by chenchao
2019-06-24 11:15:32 +0800
Browse Files
buyer overseas order cancel
b05918da

by chenchao
2019-06-24 11:15:25 +0800
Browse Files