Commits · bfd6002685c1194ace560b5883042022880bc3fc · ufo / ufo-platform

27 Dec, 2018

3 commits

update webapp
bfd60026

by htoooth
2018-12-27 14:19:29 +0800
Browse Files
修改文案
f018a664

by mali
2018-12-27 11:19:34 +0800
Browse Files
Merge branch 'master' into hotfix_erp_addMobile_1218
1c582894

by mali
2018-12-27 10:05:30 +0800
Browse Files

21 Dec, 2018

1 commit

order list open page
1b8dafdb

by 陈峰
2018-12-21 17:09:54 +0800
Browse Files

20 Dec, 2018

1 commit

product-list edit
761d2b23

by 陈峰
2018-12-20 15:02:20 +0800
Browse Files

18 Dec, 2018

4 commits

Merge branch 'master' into hotfix_erp_addMobile_1218
a8127e8e

by mali
2018-12-18 18:33:18 +0800
Browse Files
fix: erp 对接物流，增加mobile属性
11e79b0c

by qinchao
2018-12-18 17:25:20 +0800
Browse Files
鉴定中心复制按钮优化
3cac7040

by mali
2018-12-18 15:49:17 +0800
Browse Files
fix：违规次数统计，把“卖家不卖了 31”统计进来
6e325b10

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

14 Dec, 2018

6 commits

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

17 commits

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
修改订单买家地址
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
商家管理
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

ufo / ufo-platform · Commits

GitLab

27 Dec, 2018

21 Dec, 2018

20 Dec, 2018

18 Dec, 2018

14 Dec, 2018

13 Dec, 2018

12 Dec, 2018

11 Dec, 2018

10 Dec, 2018