ufo / ufo-platform · Commits

14 Dec, 2018

1 commit

Merge branch 'test6.8.3' into gray ...
7502daaf
```
Conflicts:
	order/src/main/java/com/yohoufo/order/service/proxy/InBoxFacade.java
```
by mali
2018-12-14 13:47:13 +0800
Browse Files

06 Dec, 2018

1 commit

update webapp
46278049

by htoooth
2018-12-06 16:51:50 +0800
Browse Files

04 Dec, 2018

1 commit

fix bug : 入驻时间和退驻时间显示bug
794bf12c

by qinchao
2018-12-04 11:49:51 +0800
Browse Files

03 Dec, 2018

4 commits

update webapp
4f1e91d1

by htoooth
2018-12-03 10:46:25 +0800
Browse Files
fix
21e079d4

by htoooth
2018-12-03 10:40:44 +0800
Browse Files
update webapp
d4f91b96

by htoooth
2018-12-03 10:40:15 +0800
Browse Files
比价列表去除channel_price=0的记录
00c45690

by caoyan
2018-12-03 10:26:03 +0800
Browse Files

01 Dec, 2018

21 commits

Merge branch 'hotfix_followPrice_20181130' into test6.8.2 ...
c865aafa
```
# Conflicts:
#	product/src/main/java/com/yoho/ufo/service/scheduled/ScheduledUpdateSuggestPrice.java
```
by caoyan
2018-12-01 17:43:57 +0800
Browse Files
UFO建议价
c5ce2401

by caoyan
2018-12-01 17:41:15 +0800
Browse Files
Merge branch 'hotfix_followPrice_20181130' into test6.8.2
062f5932

by caoyan
2018-12-01 16:51:20 +0800
Browse Files
UFO建议价
b1c508ca

by caoyan
2018-12-01 16:51:09 +0800
Browse Files
Merge branch 'hotfix_followPrice_20181130' into test6.8.2 ...
8695594d
```
# Conflicts:
#	product/src/main/java/com/yoho/ufo/service/scheduled/ScheduledUpdateSuggestPrice.java
```
by caoyan
2018-12-01 16:42:40 +0800
Browse Files
UFO建议价
aea03f70

by caoyan
2018-12-01 16:41:26 +0800
Browse Files
UFO建议价
468d2715

by caoyan
2018-12-01 16:28:06 +0800
Browse Files
UFO建议价
e255a8e9

by caoyan
2018-12-01 16:22:16 +0800
Browse Files
UFO建议价
7707b5d1

by caoyan
2018-12-01 15:55:01 +0800
Browse Files
Merge branch 'hotfix_followPrice_20181130' into test6.8.2
26fad4dc

by caoyan
2018-12-01 15:53:35 +0800
Browse Files
日志
9647e119

by caoyan
2018-12-01 15:53:24 +0800
Browse Files
Merge branch 'hotfix_followPrice_20181130' into test6.8.2
767de78c

by caoyan
2018-12-01 15:52:26 +0800
Browse Files
日志
61986c1e

by caoyan
2018-12-01 15:52:16 +0800
Browse Files
Merge branch 'hotfix_followPrice_20181130' into test6.8.2
01694762

by caoyan
2018-12-01 15:39:52 +0800
Browse Files
UFO建议价
37cb33bf

by caoyan
2018-12-01 15:39:42 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2
306430dd

by 陈峰
2018-12-01 15:14:29 +0800
Browse Files
html update
43168d5e

by 陈峰
2018-12-01 15:14:22 +0800
Browse Files
UFO建议价
790c05db

by caoyan
2018-12-01 15:13:25 +0800
Browse Files
UFO建议价
b2b1bcb8

by caoyan
2018-12-01 14:19:36 +0800
Browse Files
UFO建议价
e2224d46

by caoyan
2018-12-01 11:59:27 +0800
Browse Files
UFO建议价
eb31965d

by caoyan
2018-12-01 11:34:35 +0800
Browse Files

30 Nov, 2018

3 commits

UFO建议价
a058d4b2

by caoyan
2018-11-30 17:15:49 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2
b4cb3b56

by htoooth
2018-11-30 10:20:37 +0800
Browse Files
update webapp
c654a136

by htoooth
2018-11-30 10:20:27 +0800
Browse Files

29 Nov, 2018

2 commits

fix yoho品类关联2
572f2df6

by qinchao
2018-11-29 17:51:50 +0800
Browse Files
fix yoho品类关联
4a67073d

by qinchao
2018-11-29 16:51:45 +0800
Browse Files

28 Nov, 2018

7 commits

Merge branch 'dev_fix_returnback' into test6.8.2
6226b40a

by qinchao
2018-11-28 19:01:53 +0800
Browse Files
寄回控制
35216819

by qinchao
2018-11-28 19:01:03 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2
afa6daa1

by htoooth
2018-11-28 17:18:24 +0800
Browse Files
update webapp
3dd5476d

by htoooth
2018-11-28 17:18:17 +0800
Browse Files
Merge branch 'dev_suggestPrice_20181119' into test6.8.2
8a0b5bbf

by caoyan
2018-11-28 16:54:07 +0800
Browse Files
UFO比价
f6d08143

by caoyan
2018-11-28 16:52:17 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2
07709e1e

by caoyan
2018-11-28 16:44:51 +0800
Browse Files