ufo / yohoufo-fore · Commits

04 Jan, 2019

10 commits

Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
8ef7f977

by Lixiaodi
2019-01-04 10:51:54 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5 ...
c3028505
```
# Conflicts:
#	product/src/main/java/com/yohoufo/product/service/ProductService.java
```
by Lixiaodi
2019-01-04 10:51:42 +0800
Browse Files
1. add junit test ...
1f98646f
```
2. finish de-serialize config 4 buyer penalty
```
by chenchao
2019-01-04 10:50:44 +0800
Browse Files
销售日历
3aa9021c

by Lixiaodi
2019-01-04 10:49:33 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
f55ee6ce

by qinchao
2019-01-04 10:48:41 +0800
Browse Files
add 物流调拨信息
68e630fc

by qinchao
2019-01-04 10:48:22 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
5873cd91

by qinchao
2019-01-04 10:43:33 +0800
Browse Files
add 物流调拨信息
4b76364a

by qinchao
2019-01-04 10:42:51 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
195111c7

by qinchao
2019-01-04 09:32:03 +0800
Browse Files
add 物流调拨信息
cb436308

by qinchao
2019-01-04 09:30:44 +0800
Browse Files

03 Jan, 2019

16 commits

Merge branch 'dev-offline-buy' into test6.8.5
345396f5

by chenjian
2019-01-03 17:44:00 +0800
Browse Files
bugfix
43eb0b04

by chenjian
2019-01-03 17:43:46 +0800
Browse Files
Merge branch 'dev-offline-buy' into test6.8.5
5753c9d2

by chenjian
2019-01-03 16:45:58 +0800
Browse Files
skup商详
2969d179

by chenjian
2019-01-03 16:44:37 +0800
Browse Files
add 物流调拨信息
6060b4ca

by qinchao
2019-01-03 16:21:45 +0800
Browse Files
详情页支持视频
8f47b1ac

by mali
2019-01-03 15:29:04 +0800
Browse Files
详情页支持视频
628a63a4

by mali
2019-01-03 14:51:24 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
e57bb2de

by mali
2019-01-03 14:45:30 +0800
Browse Files
详情页支持视频
0f5ac5a8

by mali
2019-01-03 14:45:18 +0800
Browse Files
add app version
cc382a95

by chenchao
2019-01-03 14:38:52 +0800
Browse Files
详情页支持视频
475c9d68

by mali
2019-01-03 14:35:49 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
ede11c86

by mali
2019-01-03 14:20:53 +0800
Browse Files
Merge branch 'master' into test6.8.5
5b283c94

by mali
2019-01-03 14:20:48 +0800
Browse Files
fix refresh
6a9715b9

by chenchao
2019-01-03 12:04:23 +0800
Browse Files
keep old status list
b3de3109

by chenchao
2019-01-03 11:35:25 +0800
Browse Files
add s m
308616cd

by chenchao
2019-01-03 11:22:20 +0800
Browse Files

02 Jan, 2019

7 commits

add dao
36290a78

by chenchao
2019-01-02 18:10:49 +0800
Browse Files
Merge branch 'master' into test6.8.5
ea6344a3

by mali
2019-01-02 18:03:38 +0800
Browse Files
鉴定结果查询接口 --增加日志
08cc2a2e

by mlge
2019-01-02 16:50:53 +0800
Browse Files
鉴定接口修改
e5e608bd

by mlge
2019-01-02 16:20:05 +0800
Browse Files
add 订单状态拆分接口for platform
cbd312b6

by qinchao
2019-01-02 14:34:13 +0800
Browse Files
升级model版本5.0
715c9546

by qinchao
2019-01-02 13:52:45 +0800
Browse Files
Merge branch 'master' into test6.8.5
632c3ae3

by chenchao
2019-01-02 10:19:32 +0800
Browse Files

29 Dec, 2018

7 commits

详情页支持视频
491c221d

by mali
2018-12-29 18:47:06 +0800
Browse Files
详情页支持视频
ca783482

by mali
2018-12-29 18:44:06 +0800
Browse Files
add fail record when fail
0c2a3436

by chenchao
2018-12-29 18:10:22 +0800
Browse Files
Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.4 ...
6df274c5
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/TradeBillsService.java
```
by Lixiaodi
2018-12-29 18:05:47 +0800
Browse Files
记录日志容错
9c6c8388

by Lixiaodi
2018-12-29 18:03:29 +0800
Browse Files
Merge branch 'hotfix_buyercancelError' into test6.8.4
388c574a

by chenchao
2018-12-29 17:56:58 +0800
Browse Files
record bill log
624da6c5

by chenchao
2018-12-29 17:56:32 +0800
Browse Files