ufo / yohoufo-fore · Commits

18 Apr, 2019

12 commits

Merge branch 'test6.9.1' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.1
333cea07

by caoyan
2019-04-18 15:40:14 +0800
Browse Files
发售日历
f13da67b

by caoyan
2019-04-18 15:40:06 +0800
Browse Files
add status flow 4 batch off-shelfe
bfbba07d

by chenchao
2019-04-18 15:30:48 +0800
Browse Files
add seller goods status flow
d91c1659

by chenchao
2019-04-18 15:12:50 +0800
Browse Files
Merge branch 'dev_qc691_虚假发货工单' into test6.9.1
11d9e283

by qinchao
2019-04-18 11:35:59 +0800
Browse Files
add log
7d48b20e

by qinchao
2019-04-18 11:35:33 +0800
Browse Files
Merge branch 'dev_qc691_虚假发货工单' into test6.9.1
d5735342

by qinchao
2019-04-18 11:12:31 +0800
Browse Files
fix 物流数据
e06fdec6

by qinchao
2019-04-18 11:12:03 +0800
Browse Files
Merge branch 'dev_qc691_虚假发货工单' into test6.9.1
8d7b8519

by qinchao
2019-04-18 09:49:49 +0800
Browse Files
mq时间test
89ef227e

by qinchao
2019-04-18 09:49:14 +0800
Browse Files
Merge branch 'hotfix-invite-activity-2' into test6.9.1
da2caa0d

by LUOXC
2019-04-18 09:47:39 +0800
Browse Files
虚假发货48小时，自动取消
57d8f105

by qinchao
2019-04-18 09:44:14 +0800
Browse Files

17 Apr, 2019

21 commits

optimized
8fa49d15

by chenchao
2019-04-17 17:47:54 +0800
Browse Files
rename
a6f2c4b9

by chenchao
2019-04-17 17:06:23 +0800
Browse Files
support imperfect type
12fc9394

by chenchao
2019-04-17 16:46:14 +0800
Browse Files
add test
c287836e

by LUOXC
2019-04-17 16:43:02 +0800
Browse Files
Merge branch 'hotfix-invite-activity-2' into test6.9.1
87976af5

by LUOXC
2019-04-17 16:35:12 +0800
Browse Files
fixbug
bcbe2d35

by LUOXC
2019-04-17 16:34:45 +0800
Browse Files
log
aff5e595

by LUOXC
2019-04-17 14:15:30 +0800
Browse Files
Merge branch 'test6.9.1' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.1
79f93c2e

by LUOXC
2019-04-17 14:10:14 +0800
Browse Files
Merge branch 'hotfix-invite-activity-2' into test6.9.1
59968886

by LUOXC
2019-04-17 14:09:57 +0800
Browse Files
fixbug
da9073be

by LUOXC
2019-04-17 14:09:46 +0800
Browse Files
Merge branch 'test6.9.1' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.1
4c6da0c2

by mali
2019-04-17 14:06:10 +0800
Browse Files
pow
b83d6b0a

by mali
2019-04-17 14:06:07 +0800
Browse Files
Merge branch 'hotfix-invite-activity-2' into test6.9.1
1d319460

by LUOXC
2019-04-17 13:34:11 +0800
Browse Files
fixbug
0adaae20

by LUOXC
2019-04-17 13:33:55 +0800
Browse Files
卖家发货24小时，物流check
9561d206

by qinchao
2019-04-17 13:01:43 +0800
Browse Files
Merge branch 'hotfix-invite-activity-2' into test6.9.1 ...
70a788ba
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/controller/InviteSettlementController.java
```
by LUOXC
2019-04-17 12:47:35 +0800
Browse Files
refactor
12efa8fe

by LUOXC
2019-04-17 12:46:02 +0800
Browse Files
Merge branch 'hotfix-invite-activity-2' into test6.9.1
1ca31398

by LUOXC
2019-04-17 11:04:28 +0800
Browse Files
no message
f46eec16

by LUOXC
2019-04-17 11:04:10 +0800
Browse Files
Merge branch 'hotfix-invite-activity-2' into test6.9.1
054d2d93

by LUOXC
2019-04-17 11:02:31 +0800
Browse Files
fix bug
1854e38d

by LUOXC
2019-04-17 11:02:18 +0800
Browse Files

16 Apr, 2019

7 commits

Merge branch 'hotfix-invite-activity-2' into test6.9.1
5f6ad8d2

by LUOXC
2019-04-16 19:03:45 +0800
Browse Files
更新支付时间
0ac46cd0

by LUOXC
2019-04-16 19:03:14 +0800
Browse Files
fix
2c6aa6e7

by chenchao
2019-04-16 18:58:44 +0800
Browse Files
fix detail bug
86ca6b62

by chenchao
2019-04-16 18:37:32 +0800
Browse Files
Merge branch 'master' into test6.9.1
fadb3946

by LUOXC
2019-04-16 17:39:18 +0800
Browse Files
add imperfect goods list api
20e76574

by chenchao
2019-04-16 16:54:47 +0800
Browse Files
move new path ...
f351673d
```
optimize get buttons
```
by chenchao
2019-04-16 16:07:51 +0800
Browse Files