ufo / yohoufo-fore · Commits

07 Jan, 2019

5 commits

Merge branch 'dev_0107_crmCoupons' into test6.8.5
b4697f65

by tanling
2019-01-07 11:34:10 +0800
Browse Files
crm发送优惠券
51ad0349

by tanling
2019-01-07 11:33:48 +0800
Browse Files
Merge branch 'dev-ufoyohorepaire-20190104' into test6.8.5
d94ebac2

by csgyoho
2019-01-07 10:07:15 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
b0a51bf8

by qinchao
2019-01-07 09:50:06 +0800
Browse Files
物流信息
ee78ef66

by qinchao
2019-01-07 09:49:43 +0800
Browse Files

04 Jan, 2019

28 commits

Merge branch 'dev_qc685_状态拆分' into test6.8.5
b79a515c

by qinchao
2019-01-04 18:53:46 +0800
Browse Files
物流增加鉴定的调拨信息
872a8563

by qinchao
2019-01-04 18:53:34 +0800
Browse Files
throw error when left amount not enough
4da9c687

by chenchao
2019-01-04 18:51:05 +0800
Browse Files
add attributes
f4a88946

by chenchao
2019-01-04 18:21:21 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
bfc03eb4

by qinchao
2019-01-04 18:15:01 +0800
Browse Files
物流增加鉴定的调拨信息
4fd1c95e

by qinchao
2019-01-04 18:14:49 +0800
Browse Files
move path and change dependency
981df2d6

by chenchao
2019-01-04 18:10:35 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
c4d16e90

by qinchao
2019-01-04 17:32:00 +0800
Browse Files
最近物流信息显示
aa54686a

by qinchao
2019-01-04 17:31:18 +0800
Browse Files
add attributes ...
63662d22
```
add cal buyer cancel penalty
```
by chenchao
2019-01-04 17:16:03 +0800
Browse Files
销售日历接口拆分成两个
32f19543

by Lixiaodi
2019-01-04 16:07:33 +0800
Browse Files
完善消息融合
917682af

by csgyoho
2019-01-04 15:30:34 +0800
Browse Files
Merge branch 'dev-offline-buy' into test6.8.5
6a201ac6

by chenjian
2019-01-04 14:17:26 +0800
Browse Files
size、图片url
e9436448

by chenjian
2019-01-04 14:16:55 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
8e793da0

by qinchao
2019-01-04 13:45:03 +0800
Browse Directory »
add：订单状态拆分功能
32dfe5ac

by qinchao
2019-01-04 13:44:36 +0800
Browse Files
Merge branch 'dev_qc685_状态拆分' into test6.8.5
6a50549c

by qinchao
2019-01-04 13:03:51 +0800
Browse Directory »
add：订单状态拆分功能
1a0574f1

by qinchao
2019-01-04 13:03:37 +0800
Browse Directory »
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 Directory »
add 物流调拨信息
68e630fc

by qinchao
2019-01-04 10:48:22 +0800
Browse Directory »
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 Directory »
add 物流调拨信息
cb436308

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

03 Jan, 2019

7 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