Commits · 0d24e5702cc7b44caa15bf4ee26fca9e04ba5259 · zhujilai / 后台订单管理 · GitLab

03 Sep, 2018 2 commits
- fix conflict · 0d24e570
  朱继来 committed Sep 03, 2018
  
  0d24e570 Browse Files
- 添加自营对账 · 4c199afe
  朱继来 committed Sep 03, 2018
  
  4c199afe
30 Aug, 2018 3 commits
- Merge branch 'zjl_create_order_20180813' · 8f5e01ff
  朱继来 committed Aug 30, 2018
  
  8f5e01ff Browse Files
- Merge branch 'zjl_create_order_20180813' into development · 19864591
  朱继来 committed Aug 30, 2018
  
  19864591 Browse Files
- 自营线下审核通过添加wms_syn · f8802936
  朱继来 committed Aug 30, 2018
  
  f8802936 Browse Files
29 Aug, 2018 15 commits
- Merge branch 'zjl_create_order_20180813' · bf76e61d
  朱继来 committed Aug 29, 2018
  
  bf76e61d Browse Files
- Merge branch 'zjl_create_order_20180813' into development · a63f179a
  朱继来 committed Aug 29, 2018
  
  a63f179a Browse Files
- 添加新增自营线下文案 · 6e113225
  朱继来 committed Aug 29, 2018
  
  6e113225
- Merge branch 'zjl_create_order_20180813' into development · 67a6e894
  朱继来 committed Aug 29, 2018
  
  67a6e894 Browse Files
- Merge branch 'zjl_create_order_20180813' · 762779a7
  朱继来 committed Aug 29, 2018
  
  762779a7 Browse Files
- 调整判断 · 1a615684
  朱继来 committed Aug 29, 2018
  
  1a615684 Browse Files
- Merge branch 'zjl_create_order_20180813' into development · d16b5e18
  朱继来 committed Aug 29, 2018
  
  d16b5e18 Browse Files
- Merge branch 'zjl_create_order_20180813' · 6702bdbb
  朱继来 committed Aug 29, 2018
  
  6702bdbb Browse Files
- 添加类型判断 · 22a82528
  朱继来 committed Aug 29, 2018
  
  22a82528 Browse Files
- Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_adjust_20180828 · c330c75b
  朱继来 committed Aug 29, 2018
  
  c330c75b Browse Files
- Merge branch 'zjl_create_order_20180813' · fa4f226b
  朱继来 committed Aug 29, 2018
  
  fa4f226b Browse Files
- Merge branch 'zjl_create_order_20180813' into development · fd35506c
  朱继来 committed Aug 29, 2018
  
  fd35506c Browse Files
- 调整css · 581b75e6
  朱继来 committed Aug 29, 2018
  
  581b75e6
- Merge branch 'zjl_create_order_20180813' into development · 61112b67
  朱继来 committed Aug 29, 2018
  
  61112b67 Browse Files
- 调整新增订单 · 0831899d
  朱继来 committed Aug 29, 2018
  
  0831899d
28 Aug, 2018 16 commits
- Merge branch 'zjl_create_order_20180813' · 843d288a
  朱继来 committed Aug 28, 2018
  
  843d288a Browse Files
- Merge branch 'zjl_create_order_20180813' into development · fd37e7e8
  朱继来 committed Aug 28, 2018
  
  fd37e7e8 Browse Files
- 添加购物车判断 · 84d150eb
  朱继来 committed Aug 28, 2018
  
  84d150eb Browse Files
- Merge branch 'zjl_create_order_20180813' · 30d24fca
  朱继来 committed Aug 28, 2018
  
  30d24fca Browse Files
- Merge branch 'zjl_create_order_20180813' into development · 55719078
  朱继来 committed Aug 28, 2018
  
  55719078 Browse Files
- 修改发票判断 · 2b9b8b05
  朱继来 committed Aug 28, 2018
  
  2b9b8b05 Browse Files
- Merge branch 'zjl_create_order_20180813' · 36d9a2a0
  朱继来 committed Aug 28, 2018
  
  36d9a2a0 Browse Files
- fix conflict · 06fa5d72
  朱继来 committed Aug 28, 2018
  
  06fa5d72 Browse Files
- Merge branch 'zjl_create_order_20180813' into development · 84f43851
  朱继来 committed Aug 28, 2018
  
  84f43851 Browse Files
- 调整接口 · 4d26471f
  朱继来 committed Aug 28, 2018
  
  4d26471f Browse Files
- Merge branch 'zjl_create_order_20180813' into development · 0f972584
  朱继来 committed Aug 28, 2018
  
  0f972584 Browse Files
- 添加账号邮件搜索 · 66e85574
  朱继来 committed Aug 28, 2018
  
  66e85574
- Merge branch 'zjl_create_order_20180813' into development · 97e5b1f9
  朱继来 committed Aug 28, 2018
  
  97e5b1f9 Browse Files
- 自营线下取消订单 · 862032e6
  朱继来 committed Aug 28, 2018
  
  862032e6 Browse Files
- Merge branch 'zjl_adjust_20180828' into development · ccf4f17f
  朱继来 committed Aug 28, 2018
  
  ccf4f17f Browse Files
- 添加推送备注 · 230a309e
  朱继来 committed Aug 28, 2018
  
  230a309e
27 Aug, 2018 4 commits
- Merge branch 'zjl_create_order_20180813' into development · 9febdead
  朱继来 committed Aug 27, 2018
  
  9febdead Browse Files
- 调整user_id · 03a2741f
  朱继来 committed Aug 27, 2018
  
  03a2741f Browse Files
- Merge branch 'zjl_create_order_20180813' into development · 221f37ac
  朱继来 committed Aug 27, 2018
  
  221f37ac Browse Files
- 添加发票判断 · 630db346
  朱继来 committed Aug 27, 2018
  
  630db346 Browse Files