ufo / yohoufo-fore · Commits

12 Dec, 2018

9 commits

fix
0ec56908

by chenchao
2018-12-12 19:31:49 +0800
Browse Files
Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3
defad138

by chenchao
2018-12-12 18:41:06 +0800
Browse Files
seller order list show left time
133de129

by chenchao
2018-12-12 18:40:46 +0800
Browse Files
change inbox msg
fd0737bf

by chenchao
2018-12-12 18:16:31 +0800
Browse Files
去掉不用方法
d9b09ff2

by qinchao
2018-12-12 15:16:31 +0800
Browse Files
Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3
b01d5c9c

by mali
2018-12-12 14:16:57 +0800
Browse Files
订单取商品的颜色默认优先取颜色非色系名称
a486f64f

by mali
2018-12-12 14:16:33 +0800
Browse Files
多个订单对应一个物流单号2
b3bc36ec

by qinchao
2018-12-12 11:31:33 +0800
Browse Files
多个订单对应一个物流单号
ce56f835

by qinchao
2018-12-12 10:32:39 +0800
Browse Files

11 Dec, 2018

17 commits

super entry seller
3baac91f

by chenchao
2018-12-12 00:27:37 +0800
Browse Files
add list refresh
0dce78a3

by chenchao
2018-12-11 21:22:03 +0800
Browse Files
delete list cache
66b62894

by chenchao
2018-12-11 20:22:55 +0800
Browse Files
物流信息
6a018855

by qinchao
2018-12-11 19:09:42 +0800
Browse Files
Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3 ...
6dc0ec45
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
```
by chenchao
2018-12-11 17:09:11 +0800
Browse Files
fix seller order
87249672

by chenchao
2018-12-11 17:03:44 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3
53e0c00b

by qinchao
2018-12-11 16:38:48 +0800
Browse Files
修改地址fix
fcdcb812

by qinchao
2018-12-11 16:38:38 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3
ef2f8ac2

by chenchao
2018-12-11 16:37:58 +0800
Browse Files
fix list address info
ffdf316f

by chenchao
2018-12-11 16:37:45 +0800
Browse Files
Merge branch 'master' into test6.8.3
72529428

by mali
2018-12-11 16:31:59 +0800
Browse Files
1. support mini-app client type ...
94ecd185
```
2. buyer order waiting pay timeout 10m
```
by chenchao
2018-12-11 15:55:58 +0800
Browse Files
修改地址参考有货规则
060f6428

by qinchao
2018-12-11 15:40:53 +0800
Browse Files
转码
30ff0f04

by mali
2018-12-11 15:31:13 +0800
Browse Files
转码
dea90c85

by mali
2018-12-11 14:56:08 +0800
Browse Files
add super entry seller check
721256ac

by chenchao
2018-12-11 14:07:41 +0800
Browse Files
fix
97e09b07

by chenchao
2018-12-11 10:56:22 +0800
Browse Files

10 Dec, 2018

14 commits

add mapper
3191c4dd

by chenchao
2018-12-10 20:24:20 +0800
Browse Files
add notice seller when appraise pass
c3563da0

by chenchao
2018-12-10 19:59:49 +0800
Browse Files
support view express info 4 buyer
bf38882c

by chenchao
2018-12-10 19:11:01 +0800
Browse Files
add no encrypt address info
0d7462a5

by chenchao
2018-12-10 18:24:26 +0800
Browse Files
Merge branch 'dev6.8.3_order' into test6.8.3
51c45c3c

by chenchao
2018-12-10 17:03:53 +0800
Browse Files
add tips of least price of sku
43910fea

by chenchao
2018-12-10 17:03:21 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3
eb07497a

by qinchao
2018-12-10 16:51:50 +0800
Browse Files
fix 完善
f07b0e66

by qinchao
2018-12-10 16:51:38 +0800
Browse Files
Merge branch 'test6.8.3' into dev6.8.3_order
56c92d08

by chenchao
2018-12-10 16:45:51 +0800
Browse Files
Merge branch 'hotfix20181210sellercancelbug' into dev6.8.3_order
6144fad2

by chenchao
2018-12-10 16:45:33 +0800
Browse Files
Merge branch 'hotfix20181210sellercancelbug' into test6.8.3
0ab654a0

by chenchao
2018-12-10 16:44:53 +0800
Browse Files
add query buyer order
3222e788

by chenchao
2018-12-10 16:44:32 +0800
Browse Files
修改地址调用公共判断
779a68a2

by qinchao
2018-12-10 15:56:12 +0800
Browse Files
fix some bug
5979a229

by chenchao
2018-12-10 15:41:22 +0800
Browse Files