fe / yoho-shop-manage · Commits

06 Jun, 2017

12 commits

fix
f727fdb2

by htoooth
2017-06-06 15:48:03 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
3badf57c

by htoooth
2017-06-06 15:24:16 +0800
Browse Files
fix
a75ab372

by htoooth
2017-06-06 15:24:01 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into feature/product-return
c83f34f4

by 李奇
2017-06-06 15:22:39 +0800
Browse Files
fix
326e761a

by htoooth
2017-06-06 15:22:32 +0800
Browse Files
商品退库导出修改
e029a73a

by 李奇
2017-06-06 15:21:59 +0800
Browse Files
Merge branch 'feature/product-return' into release/2.0
14471954

by 李奇
2017-06-06 14:23:40 +0800
Browse Files
商品退库修改
c3dbc1b8

by 李奇
2017-06-06 14:22:45 +0800
Browse Files
Merge branch 'feature/fillStore' into 'release/2.0' ...
a865ea92
```
supplement



See merge request !5
```
by 陈峰
2017-06-06 14:19:28 +0800
Browse Files
supplement
a007afab

by 陈峰
2017-06-06 14:18:33 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
4e631def

by htoooth
2017-06-06 11:49:14 +0800
Browse Files
fix
fa596279

by htoooth
2017-06-06 11:47:33 +0800
Browse Files

05 Jun, 2017

12 commits

未上架列表下拉列表选项"全部"删除
710355ce

by 李奇
2017-06-05 18:22:22 +0800
Browse Files
请退单修改
69e6a094

by 李奇
2017-06-05 17:55:41 +0800
Browse Files
Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0
82a628ad

by htoooth
2017-06-05 17:38:00 +0800
Browse Files
fix
d34030ea

by htoooth
2017-06-05 17:37:50 +0800
Browse Files
时间格式化example添加
7304ca04

by 李奇
2017-06-05 17:32:02 +0800
Browse Files
Merge branch 'feature/product-return' into release/2.0 ...
e2632ecb
```
# Conflicts:
#	app/pages/repository/index.js
```
by 李奇
2017-06-05 17:19:41 +0800
Browse Files
unix时间格式过滤器添加
b9157526

by 李奇
2017-06-05 17:17:06 +0800
Browse Files
商品退库和品牌组件默认选项全部去除
96cfc6c9

by 李奇
2017-06-05 16:38:32 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
4b654ff9

by htoooth
2017-06-05 15:02:17 +0800
Browse Files
fix
125b8ced

by htoooth
2017-06-05 15:01:59 +0800
Browse Files
商品退库数据获取修改
0af5c4c8

by 李奇
2017-06-05 14:19:59 +0800
Browse Files
fix
5e2f03fe

by htoooth
2017-06-05 11:02:13 +0800
Browse Files

02 Jun, 2017

16 commits

Merge branch 'release/2.0' into feature/fillstore
97f69bd9

by 陈峰
2017-06-02 18:07:18 +0800
Browse Files
filter
d1939772

by 陈峰
2017-06-02 18:05:54 +0800
Browse Files
商品退库详情页修改
a32b17c2

by 李奇
2017-06-02 17:55:51 +0800
Browse Files
fill sotre
2a2294a9

by 陈峰
2017-06-02 17:51:58 +0800
Browse Files
merge
df022a0e

by 陈峰
2017-06-02 16:33:19 +0800
Browse Files
merge
1dbcd26d

by 陈峰
2017-06-02 16:32:40 +0800
Browse Files
yoho-lint
c59a8f3d

by 陈峰
2017-06-02 16:29:42 +0800
Browse Files
商品退库详情页路由添加
2abee60b

by 李奇
2017-06-02 16:14:51 +0800
Browse Files
fix
e18585f5

by htoooth
2017-06-02 11:33:11 +0800
Browse Files
add express
087b9012

by htoooth
2017-06-02 11:32:32 +0800
Browse Files
lint
15f92df8

by 陈峰
2017-06-02 11:17:49 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0 ...
97ece883
```
# Conflicts:
#	app/pages/repository/index.js
```
by htoooth
2017-06-02 11:03:38 +0800
Browse Files
fix
2cabc5a7

by htoooth
2017-06-02 11:03:03 +0800
Browse Files
commit
18681f7d

by 陈峰
2017-06-02 11:00:21 +0800
Browse Files
废弃的文件删除
043d3999

by 李奇
2017-06-02 10:47:48 +0800
Browse Files
commit
b3e561d0

by 陈峰
2017-06-02 10:47:15 +0800
Browse Files