ufo / ufo-platform · Commits

18 Dec, 2018

8 commits

Merge branch 'gray' into test6.8.4
598ecfcf

by mali
2018-12-18 16:26:41 +0800
Browse Files
鉴定中心复制按钮优化
3cac7040

by mali
2018-12-18 15:49:17 +0800
Browse Files
转码
88ef75b2

by mali
2018-12-18 15:31:00 +0800
Browse Files
转码补充订单的商品信息
9f13b864

by mali
2018-12-18 15:08:48 +0800
Browse Files
Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/ufo-platform into test6.8.4
ecf43b14

by mali
2018-12-18 14:45:30 +0800
Browse Files
版本升级
aa60a498

by mali
2018-12-18 14:45:18 +0800
Browse Files
Merge branch 'hotfix_count_breakruletimes_1218' into test6.8.4
927eb186

by qinchao
2018-12-18 14:00:20 +0800
Browse Files
fix：违规次数统计，把“卖家不卖了 31”统计进来
6e325b10

by qinchao
2018-12-18 13:58:43 +0800
Browse Files

17 Dec, 2018

9 commits

Merge branch 'dev_qc_6.8.4_menu' into test6.8.4
3bf486e2

by qinchao
2018-12-17 17:48:26 +0800
Browse Files
add 销售类目功能
bdbe54d0

by qinchao
2018-12-17 17:48:13 +0800
Browse Files
Merge branch 'dev_qc_6.8.4_menu' into test6.8.4
00ac23c3

by qinchao
2018-12-17 17:23:20 +0800
Browse Files
add 销售类目功能
ac3979d7

by qinchao
2018-12-17 17:20:37 +0800
Browse Files
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

8 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