fe / yoho-shop-manage · Commits

20 Jul, 2020

2 commits

Merge branch 'feature/shop-order-v2' into 'master' ...
965876d1
```
一件代发二期

一件代发二期

See merge request !112
```
by 刘志远
2020-07-20 13:47:59 +0800
Browse Files
修改版本号！
95577041

by lzhy
2020-07-20 11:36:56 +0800
Browse Files

17 Jul, 2020

2 commits

调整部分页面
bc9856a3

by lzhy
2020-07-17 18:00:35 +0800
Browse Files
修改
c8357840

by lzhy
2020-07-17 10:17:59 +0800
Browse Files

16 Jul, 2020

3 commits

分页导出每次请求1000条数据
b621aa64

by lzhy
2020-07-16 16:00:27 +0800
Browse Files
增加导出列
49bc0d72

by lzhy
2020-07-16 14:22:57 +0800
Browse Files
导出列表增加字段
8d5aad1c

by lzhy
2020-07-16 10:53:37 +0800
Browse Files

15 Jul, 2020

5 commits

优化代码
e57838b9

by lzhy
2020-07-15 17:09:54 +0800
Browse Files
修改提现
27ef3747

by lzhy
2020-07-15 15:42:57 +0800
Browse Files
修改验证手机短信验证码
f3a5fc27

by lzhy
2020-07-15 15:06:12 +0800
Browse Files
运费明细增加汇总
69515604

by lzhy
2020-07-15 10:19:57 +0800
Browse Files
修改手机号问题
575264e8

by lzhy
2020-07-15 09:56:38 +0800
Browse Files

14 Jul, 2020

5 commits

增加统计
7d37bd50

by lzhy
2020-07-14 18:33:58 +0800
Browse Files
修改点击分页时的问题
4d6635c7

by lzhy
2020-07-14 16:45:06 +0800
Browse Files
增加导出功能
dbfd492c

by lzhy
2020-07-14 15:24:03 +0800
Browse Files
修改
2efbaf7a

by lzhy
2020-07-14 14:46:49 +0800
Browse Files
增加导出功能
fe9d9874

by lzhy
2020-07-14 14:19:57 +0800
Browse Files

13 Jul, 2020

1 commit

修改字段名称
555e841c

by lzhy
2020-07-13 18:09:01 +0800
Browse Files

10 Jul, 2020

2 commits

合并代码
c475080b

by lzhy
2020-07-10 17:25:06 +0800
Browse Files
交易账务明细
20520f57

by lzhy
2020-07-10 17:24:34 +0800
Browse Files

09 Jul, 2020

4 commits

commit
bfd54252

by lzhy
2020-07-09 16:29:40 +0800
Browse Files
Merge remote-tracking branch 'origin/release/6.9.24' ...
ccfbb1bd
```
# Conflicts:
#	package.json
```
by shuaiguo
2020-07-09 16:09:46 +0800
Browse Files
修改
794ee905

by lzhy
2020-07-09 15:01:27 +0800
Browse Files
修改
b2ee45a7

by lzhy
2020-07-09 13:41:00 +0800
Browse Files

08 Jul, 2020

1 commit

修改
6b422edc

by lzhy
2020-07-08 11:51:15 +0800
Browse Files

06 Jul, 2020

1 commit

修改错别字
b0eae408

by lzhy
2020-07-06 17:19:06 +0800
Browse Files

02 Jul, 2020

2 commits

修改字段名称
d1331705

by lzhy
2020-07-02 17:10:23 +0800
Browse Files
一件代发订单退货申请列表导出
69f57003

by lzhy
2020-07-02 14:41:38 +0800
Browse Files

09 May, 2020

7 commits

Merge branch 'feature/shop/zjr-demo' into 'master' ...
fa93bad3
```
From feature/shop/zjr-demo into master

重新发布

See merge request !111
```
by 刘志远
2020-05-09 11:44:20 +0800
Browse Files
1.2.5
19d0c7eb

by jiran.zhao
2020-05-09 11:42:12 +0800
Browse Files
Merge branch 'feature/shop/zjr-demo' of http://git.yoho.cn/fe/yoho-shop-manage into release/6.9.24 ...
b93b2ed9
```
# Conflicts:
#	package.json
```
by jiran.zhao
2020-05-09 10:40:07 +0800
Browse Files
beta24 提现时间异常
c94482d8

by jiran.zhao
2020-05-09 10:29:53 +0800
Browse Files
Merge branch 'feature/shop/zjr-demo' into 'master' ...
58be446e
```
From feature/shop/zjr-demo into master

提现时间选择异常

See merge request !110
```
by 刘志远
2020-05-09 10:06:25 +0800
Browse Files
'提现时间选择异常'
014cc4f6

by jiran.zhao
2020-05-09 09:50:59 +0800
Browse Files
'提现时间选择异常'
15cd453b

by jiran.zhao
2020-05-09 09:48:45 +0800
Browse Files

08 May, 2020

4 commits

Merge branch 'feature/shop/zjr-demo' into 'master' ...
51426ae0
```
From feature/shop/zjr-demo into master

申请提现金额可编辑异常修复

See merge request !109
```
by 刘志远
2020-05-08 17:39:22 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/fe/yoho-shop-manage into feature/shop/zjr-demo
2c77ae6d

by jiran.zhao
2020-05-08 17:36:17 +0800
Browse Files
'1.2.3'
be7f5ff6

by jiran.zhao
2020-05-08 17:34:09 +0800
Browse Files
'申请提现金额可编辑异常修复'
5a2c1635

by jiran.zhao
2020-05-08 17:33:28 +0800
Browse Files

06 May, 2020

1 commit

Merge branch 'feature/shop/zjr-demo' into 'master' ...
f0deb574
```
From feature/shop/zjr-demo into master

提现明细类型账号待定，去除导出

See merge request !108
```
by 刘志远
2020-05-06 09:58:27 +0800
Browse Files