fe / yoho-shop-manage · Commits

06 Jun, 2017

23 commits

render
97ef8d68

by 陈峰
2017-06-06 18:17:42 +0800
Browse File »
suppliment productName
76ac79ec

by 陈峰
2017-06-06 16:58:27 +0800
Browse Files
移除测试
fbd4318a

by 陈峰
2017-06-06 16:49:17 +0800
Browse Files
Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0
eaf335c7

by 陈峰
2017-06-06 16:47:35 +0800
Browse Files
请退单导出修改
ee4a50a3

by 李奇
2017-06-06 16:48:06 +0800
Browse Files
select-stock-status
98b55bd4

by 陈峰
2017-06-06 16:47:27 +0800
Browse Files
fix
0d441dfe

by htoooth
2017-06-06 16:44:30 +0800
Browse Files
fix
6aa0cffb

by htoooth
2017-06-06 16:24:16 +0800
Browse Files
fix
7d781534

by htoooth
2017-06-06 16:17:26 +0800
Browse Files
Merge remote-tracking branch 'origin/release/2.0' into release/2.0
cb7fb9cc

by htoooth
2017-06-06 15:48:16 +0800
Browse Files
fix
f727fdb2

by htoooth
2017-06-06 15:48:03 +0800
Browse Files
导出标题添加、代码违规修改
9aa12207

by 李奇
2017-06-06 15:32:00 +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

5 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