ufo / ufo-platform · Commits

17 Dec, 2018

5 commits

Merge branch 'dev_qc_6.8.4_menu' into test6.8.4
cabe2810

by qinchao
2018-12-17 17:03:27 +0800
Browse Files
add 销售类目功能
f8b8ec5d

by qinchao
2018-12-17 17:03:04 +0800
Browse Files
add 销售类目功能
013071a4

by qinchao
2018-12-17 15:27:44 +0800
Browse Files
转码
9fac5eec

by mali
2018-12-17 14:43:07 +0800
Browse Files
add 销售类目功能
643b728b

by qinchao
2018-12-17 14:08:40 +0800
Browse Files

15 Dec, 2018

4 commits

转码
d282cb8d

by mali
2018-12-15 11:45:04 +0800
Browse Files
Merge branch 'gray' into test6.8.4
ba7856fe

by mali
2018-12-15 10:26:03 +0800
Browse Files
Merge branch 'test6.8.3' into test6.8.4
95f64011

by mali
2018-12-15 10:25:55 +0800
Browse Files
转码
ab2d0321

by mali
2018-12-15 10:25:45 +0800
Browse Files

14 Dec, 2018

11 commits

转码
c7284eca

by mali
2018-12-14 16:25:19 +0800
Browse Files
Merge branch 'dev_qc_6.8.4_menu' into test6.8.4
f6085170

by qinchao
2018-12-14 15:34:33 +0800
Browse Files
销售类目
6bdcebc7

by qinchao
2018-12-14 15:33:14 +0800
Browse Files
直播的回调请求
ed5a6bef

by mali
2018-12-14 15:11:51 +0800
Browse Files
Merge branch 'test6.8.3' into gray
4fc7c6c8

by mali
2018-12-14 13:47:22 +0800
Browse Files
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
直播的回调请求
8b297962

by mali
2018-12-14 13:46:31 +0800
Browse Files
商家管理
c06d0d10

by csgyoho
2018-12-14 11:31:06 +0800
Browse Files
商家管理
0f26fe75

by csgyoho
2018-12-14 11:15:56 +0800
Browse Files
商家管理
2aded2f6

by csgyoho
2018-12-14 10:38:37 +0800
Browse Files
商家管理
f1dff63a

by csgyoho
2018-12-14 09:42:28 +0800
Browse Files

13 Dec, 2018

20 commits

Merge branch 'test6.8.3' into test6.8.4 ...
84e72397
```
Conflicts:
	common/pom.xml
```
by mali
2018-12-13 20:12:01 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3
45e40b4b

by caoyan
2018-12-13 18:42:08 +0800
Browse Files
修改订单买家地址
a59abab5

by caoyan
2018-12-13 18:41:58 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3
b7470a75

by csgyoho
2018-12-13 18:37:10 +0800
Browse Files
商家管理优化
d36aa576

by csgyoho
2018-12-13 18:37:00 +0800
Browse Files
Merge branch 'dev_qc_6.8.4_menu' into test6.8.4
d5168dd2

by qinchao
2018-12-13 18:08:05 +0800
Browse Files
.ingonre文件
d71e64af

by qinchao
2018-12-13 18:07:40 +0800
Browse Files
add 销售类目管理
48d7ce28

by qinchao
2018-12-13 18:02:29 +0800
Browse Files
修改订单买家地址
e790f1dd

by caoyan
2018-12-13 17:59:13 +0800
Browse Files
商家管理
1440c4d4

by csgyoho
2018-12-13 17:51:21 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3
a370c0b2

by csgyoho
2018-12-13 17:26:15 +0800
Browse Files
Merge branch 'dev-margin-20181207' into test6.8.3
5febcfd5

by csgyoho
2018-12-13 17:26:10 +0800
Browse Files
商家管理
35926f4c

by csgyoho
2018-12-13 17:25:56 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3
5082be53

by mali
2018-12-13 17:10:11 +0800
Browse Files
复制功能
fd1c78cf

by mali
2018-12-13 17:10:06 +0800
Browse Files
Merge branch 'dev-margin-20181207' into test6.8.3
0e5f6cb2

by csgyoho
2018-12-13 17:03:11 +0800
Browse Files
商家管理
d2ac48a1

by csgyoho
2018-12-13 17:02:43 +0800
Browse Files
鉴定中心列表优化
a1d27592

by mali
2018-12-13 14:38:12 +0800
Browse Files
商家入驻
8c0214f7

by csgyoho
2018-12-13 13:55:40 +0800
Browse Files
Merge branch 'dev-margin-20181207' into test6.8.3 ...
1a39e607
```
# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by csgyoho
2018-12-13 13:53:50 +0800
Browse Files