ufo / yohoufo-fore · Commits

18 Apr, 2019

1 commit

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

by LUOXC
2019-04-18 09:47:39 +0800
Browse Files

17 Apr, 2019

20 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
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

18 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
Merge branch 'hotfix_vedio' into test6.9.1
263e8836

by mali
2019-04-16 15:57:19 +0800
Browse Files
鉴定视频优化
40277d00

by mali
2019-04-16 14:52:09 +0800
Browse Files
鉴定视频优化
22dca33f

by mali
2019-04-16 14:36:07 +0800
Browse Files
optimized
0893307a

by chenchao
2019-04-16 11:45:40 +0800
Browse Files
update title
179e58b1

by LUOXC
2019-04-16 11:33:08 +0800
Browse Files
Merge branch 'test6.9.0' into gray
1b3e3dad

by mali
2019-04-16 11:25:54 +0800
Browse Files
增加rankType
73f5fddb

by Lixiaodi
2019-04-16 11:25:20 +0800
Browse Files
Merge branch 'hotfix_vedio' into test6.9.1
dfadb297

by mali
2019-04-16 11:24:21 +0800
Browse Files
增加接口，根据skup查支付时间
ab487839

by qinchao
2019-04-16 11:03:14 +0800
Browse Files
Merge branch 'master' into test6.9.1 ...
fa1d3d15
```
Conflicts:
	order/src/main/java/com/yohoufo/order/service/impl/InviteSettlementServiceImpl.java
```
by mali
2019-04-16 09:58:59 +0800
Browse Files
Merge branch 'gray' into hotfix_vedio
3dd73011

by mali
2019-04-16 09:38:21 +0800
Browse Files

15 Apr, 2019

1 commit

split in-stock + pre-sale, imperfect
c9f3272a

by chenchao
2019-04-15 18:37:08 +0800
Browse Files