ufo / ufo-platform · Commits

13 Dec, 2018

11 commits

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
商家管理
bf91f81a

by csgyoho
2018-12-13 10:58:37 +0800
Browse Files

12 Dec, 2018

1 commit

框架整改
ceb123b4

by mali
2018-12-12 19:37:19 +0800
Browse Files

11 Dec, 2018

5 commits

Merge branch 'hotfix/style_modify' into 'test6.8.3' ...
018aec2e
```
修改登录页，首页样式



See merge request !11
```
by 陈峰
2018-12-11 19:21:21 +0800
Browse Files
鉴定发货只查询顺丰
9c86e44a

by mali
2018-12-11 18:30:07 +0800
Browse Files
修改登录页，首页样式
4dee0e0f

by 邱骏
2018-12-11 18:21:36 +0800
Browse Files
转码
850357f1

by mali
2018-12-11 18:09:24 +0800
Browse Files
页面bug修复
32517291

by liangyi.chen@yoho.cn
2018-12-11 10:53:33 +0800
Browse Files

10 Dec, 2018

2 commits

跨越支持
40934319

by mali
2018-12-10 18:03:34 +0800
Browse Files
跨越支持
be8e162e

by mali
2018-12-10 16:21:31 +0800
Browse Files

07 Dec, 2018

2 commits

基础商品支持详情
ac3bd812

by mali
2018-12-07 16:13:13 +0800
Browse Files
基础商品支持详情
3ae3e3e3

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

06 Dec, 2018

11 commits

依赖搜索模块
d1ea0c07

by mali
2018-12-06 17:36:26 +0800
Browse Files
Merge branch 'master' into test6.8.3
7ffe6b4c

by mali
2018-12-06 17:16:33 +0800
Browse Files
update webapp
46278049

by htoooth
2018-12-06 16:51:50 +0800
Browse Files
尺码可修改
4751d864

by mali
2018-12-06 16:27:17 +0800
Browse Files
尺码可修改
8b6f3060

by mali
2018-12-06 16:10:31 +0800
Browse Files
尺码可修改
329ee75e

by mali
2018-12-06 15:33:34 +0800
Browse Files
Merge branch 'dev_6.8.3_product' into test6.8.3
6ec5e955

by mali
2018-12-06 10:44:55 +0800
Browse Files
修改货号名称
84334b40

by Lixiaodi
2018-12-06 10:43:37 +0800
Browse Files
尺码可修改
761568f0

by mali
2018-12-06 10:32:22 +0800
Browse Files
Merge branch 'dev_6.8.3_product' into test6.8.3
baa18347

by mali
2018-12-06 10:31:26 +0800
Browse Files
尺码可修改
d16c0224

by mali
2018-12-06 10:13:49 +0800
Browse Files

05 Dec, 2018

6 commits

Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3
b004ae47

by mali
2018-12-05 17:52:53 +0800
Browse Files
尺码可修改
73eb2f0c

by mali
2018-12-05 17:52:42 +0800
Browse Files
UFO搜索词页面
f6110386

by chenliangyi
2018-12-05 17:47:21 +0800
Browse Files
尺码可修改
ecea386e

by mali
2018-12-05 17:42:44 +0800
Browse Files
Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3
69e2df98

by mali
2018-12-05 17:23:09 +0800
Browse Files
尺码可修改
f20f1b07

by mali
2018-12-05 17:22:56 +0800
Browse Files

04 Dec, 2018

2 commits

增加sku 商品编码查询
53cfb70a

by Lixiaodi
2018-12-04 15:21:55 +0800
Browse Files
后台买家地址放宽到鉴定通过前
70f1b46b

by caoyan
2018-12-04 14:49:24 +0800
Browse Files