ufo / yohoufo-fore · Commits

13 Dec, 2018

17 commits

drop cache
5b71bf1f

by chenchao
2018-12-13 18:22:22 +0800
Browse Files
Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3 ...
f06cc3ca
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderDetailService.java
```
by chenchao
2018-12-13 17:04:57 +0800
Browse Files
fix nullpoint
43c2bc30

by chenchao
2018-12-13 17:03:51 +0800
Browse Files
fix nullpoint
e5ea61f2

by chenchao
2018-12-13 17:01:47 +0800
Browse Files
标题改为：物流详情
28367c57

by qinchao
2018-12-13 16:51:48 +0800
Browse Files
change data construct
85d482f8

by chenchao
2018-12-13 15:59:48 +0800
Browse Files
Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3
b970a644

by chenchao
2018-12-13 15:52:58 +0800
Browse Files
fix timeout of seller see buyer not pay order
bbd9d050

by chenchao
2018-12-13 15:52:37 +0800
Browse Files
add new api 4 seller goods list
df8b9223

by chenchao
2018-12-13 15:13:06 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3
3fc306f4

by mali
2018-12-13 11:28:20 +0800
Browse Files
jvm参数内存修改
dd6e3463

by mali
2018-12-13 11:28:15 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3
c936d150

by qinchao
2018-12-13 11:14:49 +0800
Browse Files
fix 物流
fcd30529

by qinchao
2018-12-13 11:14:39 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3
5070ff60

by mali
2018-12-13 11:09:10 +0800
Browse Files
搜索词按排序加创建时间倒序培训
abd13b4b

by mali
2018-12-13 11:09:05 +0800
Browse Files
fix bug buyer can see seller deliver express info
5f0c9d9b

by chenchao
2018-12-13 11:05:29 +0800
Browse Files
物流
a22a1ad1

by qinchao
2018-12-13 10:56:01 +0800
Browse Files

12 Dec, 2018

14 commits

inbox msg mode invoke
95c077af

by chenchao
2018-12-12 21:30:17 +0800
Browse Files
fix super entry
bd0d2b32

by chenchao
2018-12-12 20:10:09 +0800
Browse Files
remove useless
886562c3

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

by chenchao
2018-12-12 19:32:54 +0800
Browse Files
fix seller show buyer left time
269988bb

by chenchao
2018-12-12 19:32:42 +0800
Browse Files
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

9 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