Commits · a63f179ab7591349b6578c06bff05009c8d0033d · zhujilai / 后台订单管理 · GitLab

29 Aug, 2018 10 commits
- 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
- 调整判断 · 1a615684
  朱继来 committed Aug 29, 2018
  
  1a615684 Browse Files
- Merge branch 'zjl_create_order_20180813' into development · d16b5e18
  朱继来 committed Aug 29, 2018
  
  d16b5e18 Browse Files
- 添加类型判断 · 22a82528
  朱继来 committed Aug 29, 2018
  
  22a82528 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 12 commits
- 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' into development · 55719078
  朱继来 committed Aug 28, 2018
  
  55719078 Browse Files
- 修改发票判断 · 2b9b8b05
  朱继来 committed Aug 28, 2018
  
  2b9b8b05 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 6 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
- Merge branch 'zjl_create_order_20180813' into development · d69b4c93
  朱继来 committed Aug 27, 2018
  
  d69b4c93 Browse Files
- 新增联营、自营线上订单 · 7d62d6ad
  朱继来 committed Aug 27, 2018
  
  7d62d6ad
22 Aug, 2018 8 commits
- Merge branch 'zjl_create_order_20180813' into development · a403e8c2
  朱继来 committed Aug 22, 2018
  
  a403e8c2 Browse Files
- 自营线下订单隐藏取消按钮 · c5007003
  朱继来 committed Aug 22, 2018
  
  c5007003 Browse Files
- Merge branch 'zjl_create_order_20180813' into development · f954dedf
  朱继来 committed Aug 22, 2018
  
  f954dedf Browse Files
- 自营线下订单不显示发票按钮 · 11abd980
  朱继来 committed Aug 22, 2018
  
  11abd980 Browse Files
- Merge branch 'zjl_create_order_20180813' into development · f40551fa
  朱继来 committed Aug 22, 2018
  
  f40551fa Browse Files
- 添加支付时间和取消时间 · 50b83220
  朱继来 committed Aug 22, 2018
  
  50b83220 Browse Files
- Merge branch 'zjl_create_order_20180813' into development · 793d8cec
  朱继来 committed Aug 22, 2018
  
  793d8cec Browse Files
- 调整新增自营线下订单 · 89258934
  朱继来 committed Aug 22, 2018
  
  89258934 Browse Files
21 Aug, 2018 3 commits
- Merge branch 'zjl_create_order_20180813' into development · d0786343
  朱继来 committed Aug 21, 2018
  
  d0786343 Browse Files
- fix conflicts · bb865f41
  朱继来 committed Aug 21, 2018
  
  bb865f41
- 自营线下订单 · ad976e08
  朱继来 committed Aug 21, 2018
  
  ad976e08 Browse Files
17 Aug, 2018 1 commit
- 暂存 · bf9e86a3
  朱继来 committed Aug 17, 2018
  
  bf9e86a3 Browse Files