Commits · 3fae599d02abc09208558af0f490efe98ab30c24 · 邓莹莹 / backend_auto

15 Jun, 2021 6 commits
- 次卡-提交退款申请接口 · 3fae599d
  张慧 authored Jun 15, 2021
  
  3fae599d
- 次卡-申请退款接口 · 90fe57cc
  张慧 authored Jun 15, 2021
  
  90fe57cc
- 次卡-取消订单接口 · d44ba5f8
  张慧 authored Jun 15, 2021
  
  d44ba5f8
- 我的订单-各状态订单数量接口 · d8415725
  张慧 authored Jun 15, 2021
  
  d8415725
- 次卡订单详情接口 · ff52eb4c
  张慧 authored Jun 15, 2021
  
  ff52eb4c
- 次卡-微信支付和支付宝支付接口 · bb0e0692
  张慧 authored Jun 15, 2021
  
  bb0e0692
11 Jun, 2021 25 commits
- Merge branch 'common_dev' into cuixin_dev · 0d6e9bee
  aha authored Jun 11, 2021
  
  0d6e9bee
- om后台登陆 · 47902d22
  aha authored Jun 11, 2021
  
  47902d22
- Merge branch 'common_dev' into zhanghui_dev · f4a9ba01
  张慧 authored Jun 11, 2021
```
次卡相关接口
```
  f4a9ba01
- 修改支付平台传参方式-改为接口返回传参 · 681ae0a2
  张慧 authored Jun 11, 2021
  
  681ae0a2
- 提交OM后台的项目 · 2ded200d
  邓莹莹 authored Jun 11, 2021
  
  2ded200d
- 次卡-提交订单接口 · 98b297df
  张慧 authored Jun 11, 2021
  
  98b297df
- 次卡-支付平台接口 · 384dcb44
  张慧 authored Jun 11, 2021
  
  384dcb44
- 修复报错 · 792155ce
  张慧 authored Jun 11, 2021
  
  792155ce
- 次卡-确认订单页面-修改手机号接口 · 04f2fe93
  张慧 authored Jun 11, 2021
  
  04f2fe93
- web2问题解决 · 3d603de3
  陈雪 authored Jun 11, 2021
  
  3d603de3
- 商品编辑 · 72053e31
  陈雪 authored Jun 11, 2021
  
  72053e31
- 商品编辑 · 353bbacb
  陈雪 authored Jun 11, 2021
  
  353bbacb
- chongtu · 2e83a3f6
  陈雪 authored Jun 11, 2021
  
  2e83a3f6
- chongtu · 2044db71
  陈雪 authored Jun 11, 2021
  
  2044db71
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · d7f8d0df
  陈雪 authored Jun 11, 2021
  
  d7f8d0df
- Merge branch 'common_dev' into zwn_dev · fb89a48b
  张伟男 authored Jun 11, 2021
  
  fb89a48b
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · abf4910d
  陈雪 authored Jun 11, 2021
  
  abf4910d
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · 72bbe9d9
  陈雪 authored Jun 11, 2021
  
  72bbe9d9
- 冲突 · 9d925952
  陈雪 authored Jun 11, 2021
  
  9d925952
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · e9999a6d
  张慧 authored Jun 11, 2021
  
  e9999a6d
- Merge branch 'common_dev' into zwn_dev · d7c6b0fc
  张伟男 authored Jun 11, 2021
  
  d7c6b0fc
- 1 · c1725270
  张伟男 authored Jun 11, 2021
  
  c1725270
- 解决合并冲突 · 4f263eb9
  张慧 authored Jun 11, 2021
  
  4f263eb9
- AI · e437a2a6
  张伟男 authored Jun 11, 2021
  
  e437a2a6
- 编辑商品 · 690801fd
  陈雪 authored Jun 11, 2021
  
  690801fd
10 Jun, 2021 9 commits
- Merge branch 'common_dev' into dyy_dev · d72713fa
  邓莹莹 authored Jun 10, 2021
  
  d72713fa
- 2021-6-10 普通美购下单接口 · 36aa3b29
  邓莹莹 authored Jun 10, 2021
  
  36aa3b29
- 次卡-确认订单接口 · 16d64d2b
  张慧 authored Jun 10, 2021
  
  16d64d2b
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into ly_dev · 3fb19d9c
  林颖 authored Jun 10, 2021
```
已跑过能跑通
# Conflicts:
#	path_setting.py
```
  3fb19d9c
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into ly_dev · 6cfc9cd2
  林颖 authored Jun 10, 2021
```
已跑过能跑通
============ 186 passed, 3 skipped, 4 warnings in 123.52s (0:02:03) ============
# Conflicts:
#	path_setting.py
```
  6cfc9cd2
- 评论相关--后续 · 6a3ad08b
  林颖 authored Jun 10, 2021
  
  6a3ad08b
- 评论相关 · d06bf18d
  林颖 authored Jun 10, 2021
  
  d06bf18d
- Merge branch 'common_dev' into cuixin_dev · 296c1e5e
  aha authored Jun 10, 2021
  
  296c1e5e
- 合并master · 4bc23e39
  aha authored Jun 10, 2021
  
  4bc23e39