fe / yoho-shop-manage · Commits

26 Jun, 2017

10 commits

Merge branch 'release/2.0' into 'master' ...
865a7518
```
api erp



See merge request !11
```
by 陈峰
2017-06-26 14:17:55 +0800
Browse Files
api erp
3cb3f176

by 陈峰
2017-06-26 14:17:48 +0800
Browse Files
Merge branch 'release/2.0' into 'master' ...
31a2b492
```
remove plugin



See merge request !10
```
by 陈峰
2017-06-26 14:13:47 +0800
Browse Files
remove plugin
bd9f0968

by 陈峰
2017-06-26 14:13:37 +0800
Browse Files
Merge branch 'release/2.0' into 'master' ...
69cc87d7
```
Release/2.0



See merge request !9
```
by 陈峰
2017-06-26 14:06:48 +0800
Browse Files
Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0
4ddffc41

by 陈峰
2017-06-26 14:06:38 +0800
Browse Files
1.0.14
f102334e

by 陈峰
2017-06-26 14:06:30 +0800
Browse Files
Merge branch 'release/2.0' into 'master' ...
026462b3
```
Release/2.0



See merge request !8
```
by 陈峰
2017-06-26 13:59:13 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
04001c25

by htoooth
2017-06-26 12:57:17 +0800
Browse Files
fix
715180b8

by htoooth
2017-06-26 12:55:45 +0800
Browse Files

23 Jun, 2017

3 commits

yarn
95af741c

by 陈峰
2017-06-23 16:10:39 +0800
Browse Files
build
2546d20b

by 陈峰
2017-06-23 15:17:35 +0800
Browse Files
op
857d4171

by 陈峰
2017-06-23 09:42:47 +0800
Browse Files

22 Jun, 2017

2 commits

ignore
6962a646

by 陈峰
2017-06-22 11:00:51 +0800
Browse Files
ignore
6cee7bef

by 陈峰
2017-06-22 10:58:51 +0800
Browse Files

21 Jun, 2017

17 commits

调拨发货完成data store归集
9f3989cc

by 李奇
2017-06-21 16:46:17 +0800
Browse Files
调拨发货未完成data store归集
3bdfbc18

by 李奇
2017-06-21 16:39:27 +0800
Browse Files
调拨发货物流列表data store归集
841568b7

by 李奇
2017-06-21 16:29:43 +0800
Browse Files
vip价格管理data store归集
bb13b399

by 李奇
2017-06-21 15:57:11 +0800
Browse Files
已上架data store归集
26aa7f9f

by 李奇
2017-06-21 15:49:10 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
e78ef8bd

by htoooth
2017-06-21 15:37:15 +0800
Browse Files
fix
2821fec4

by htoooth
2017-06-21 15:36:14 +0800
Browse Files
未上架data store归集
cce7673a

by 李奇
2017-06-21 15:32:25 +0800
Browse Files
Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0
855fba08

by htoooth
2017-06-21 15:10:29 +0800
Browse Files
fix
2d87fb0a

by htoooth
2017-06-21 15:09:53 +0800
Browse Files
fix
9104901e

by htoooth
2017-06-21 14:59:54 +0800
Browse Files
fix
8c4dd1ee

by htoooth
2017-06-21 14:41:38 +0800
Browse Files
Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0
9d36d5fc

by 陈峰
2017-06-21 14:32:59 +0800
Browse Files
build
d5969304

by 陈峰
2017-06-21 14:32:50 +0800
Browse Directory »
Merge branch 'release/2.0' into refactor/2.0 ...
b1e25eae
```
# Conflicts:
#	app/pages/product/edit/edit.vue
```
by htoooth
2017-06-21 14:32:44 +0800
Browse Files
Merge branch 'release/2.0' into 'master' ...
df5e150a
```
Release/2.0



See merge request !7
```
by 陈峰
2017-06-21 14:16:03 +0800
Browse Files
fix
84ef5dab

by htoooth
2017-06-21 10:17:07 +0800
Browse Files

20 Jun, 2017

8 commits

fix
5ef98577

by htoooth
2017-06-20 18:06:29 +0800
Browse Files
fix
4e410775

by htoooth
2017-06-20 17:54:05 +0800
Browse Files
Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0
bdb60402

by htoooth
2017-06-20 17:47:34 +0800
Browse Files
fix
9d9ebc09

by htoooth
2017-06-20 17:47:13 +0800
Browse Files
Merge branch 'release/2.0'
3c1d8a80

by 陈峰
2017-06-20 16:50:06 +0800
Browse Files
1.0.13
51dc8c59

by 陈峰
2017-06-20 16:49:46 +0800
Browse Files
物流列表接口接口添加
66e4356b

by 李奇
2017-06-20 16:47:57 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
b3a281bc

by htoooth
2017-06-20 16:36:48 +0800
Browse Files