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

21 Aug, 2018 1 commit
- fix conflicts · bb865f41
  朱继来 committed Aug 21, 2018
  
  bb865f41
13 Aug, 2018 2 commits
- Merge branch 'zjl_adjust_redis_20180813' into development · 515f9825
  朱继来 committed Aug 13, 2018
  
  515f9825 Browse Files
- 增加redis配置 · 5403df08
  朱继来 committed Aug 13, 2018
  
  5403df08
09 Aug, 2018 2 commits
- Merge branch 'yyc_order_cancel' into development · a3fed4c5
  杨裕城 committed Aug 09, 2018
  
  a3fed4c5 Browse Files
- 显示取消按钮 · 724b8d8e
  杨裕城 committed Aug 09, 2018
  
  724b8d8e Browse Files
03 Aug, 2018 4 commits
- Merge branch 'zjl_items_price_20180731' into development · 5770ad9a
  朱继来 committed Aug 03, 2018
  
  5770ad9a Browse Files
- 调整展示 · d4a031de
  朱继来 committed Aug 03, 2018
  
  d4a031de Browse Files
- Merge branch 'zjl_items_price_20180731' into development · 150686fd
  朱继来 committed Aug 03, 2018
  
  150686fd Browse Files
- 展示分摊后的优惠金额 · 9ce26a4c
  朱继来 committed Aug 03, 2018
  
  9ce26a4c Browse Files
02 Aug, 2018 5 commits
- Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_items_price_20180731 · f5cd9117
  朱继来 committed Aug 02, 2018
  
  f5cd9117 Browse Files
- Merge branch 'zjl_export_20180730' into development · 665e8fd2
  朱继来 committed Aug 02, 2018
  
  665e8fd2 Browse Files
- 添加用户来源判断 · 72637865
  朱继来 committed Aug 02, 2018
  
  72637865 Browse Files
- Merge branch 'zjl_export_20180730' into development · 9a971e58
  朱继来 committed Aug 02, 2018
  
  9a971e58 Browse Files
- 调整判断新用户（半年前--下单时间） · db5830ed
  朱继来 committed Aug 02, 2018
  
  db5830ed Browse Files
31 Jul, 2018 18 commits
- 自营订单详情添加型号 · d2e3468b
  朱继来 committed Jul 31, 2018
  
  d2e3468b Browse Files
- Merge branch 'zjl_export_20180730' · cfab0595
  朱继来 committed Jul 31, 2018
  
  cfab0595 Browse Files
- Merge branch 'zjl_export_20180730' into development · 8f092758
  朱继来 committed Jul 31, 2018
  
  8f092758 Browse Files
- 调整新用户判断 · 4d7c7ff6
  朱继来 committed Jul 31, 2018
  
  4d7c7ff6 Browse Files
- Merge branch 'zjl_export_20180730' into development · b49fef8c
  朱继来 committed Jul 31, 2018
  
  b49fef8c Browse Files
- Merge branch 'zjl_export_20180730' · 3bf1948b
  朱继来 committed Jul 31, 2018
  
  3bf1948b Browse Files
- 调整 · 43f1cc62
  朱继来 committed Jul 31, 2018
  
  43f1cc62 Browse Files
- 调整 · 948587ca
  朱继来 committed Jul 31, 2018
  
  948587ca Browse Files
- Merge branch 'zjl_export_20180730' into development · 0a092e41
  朱继来 committed Jul 31, 2018
  
  0a092e41 Browse Files
- 调整导出变量 · c623b85c
  朱继来 committed Jul 31, 2018
  
  c623b85c Browse Files
- Merge branch 'zjl_export_20180730' into development · 3a7b689d
  朱继来 committed Jul 31, 2018
  
  3a7b689d Browse Files
- 调整推送人展示 · 4c23c690
  朱继来 committed Jul 31, 2018
  
  4c23c690 Browse Files
- Merge branch 'zjl_export_20180730' into development · da27b8b1
  朱继来 committed Jul 31, 2018
  
  da27b8b1 Browse Files
- 调整判断是否为新用户 · 3d126758
  朱继来 committed Jul 31, 2018
  
  3d126758 Browse Files
- Merge branch 'zjl_export_20180730' into development · 8e59e701
  朱继来 committed Jul 31, 2018
  
  8e59e701 Browse Files
- 调整导出 · 5e6e1d15
  朱继来 committed Jul 31, 2018
  
  5e6e1d15 Browse Files
- Merge branch 'zjl_export_20180730' into development · ec338be1
  朱继来 committed Jul 31, 2018
  
  ec338be1 Browse Files
- 调整用户来源 · 86ddaad3
  朱继来 committed Jul 31, 2018
  
  86ddaad3 Browse Files
30 Jul, 2018 8 commits
- Merge branch 'zjl_export_20180730' into development · 05803f35
  朱继来 committed Jul 30, 2018
  
  05803f35 Browse Files
- 优化 · cc7813f3
  朱继来 committed Jul 30, 2018
  
  cc7813f3 Browse Files
- Merge branch 'zjl_export_20180730' into development · 28c1cd17
  朱继来 committed Jul 30, 2018
  
  28c1cd17 Browse Files
- 调整变量 · e5a515e9
  朱继来 committed Jul 30, 2018
  
  e5a515e9 Browse Files
- Merge branch 'zjl_export_20180730' into development · 30023ce2
  朱继来 committed Jul 30, 2018
  
  30023ce2 Browse Files
- 调整 · ad397379
  朱继来 committed Jul 30, 2018
  
  ad397379 Browse Files
- Merge branch 'zjl_export_20180730' into development · d4b96f9f
  朱继来 committed Jul 30, 2018
  
  d4b96f9f Browse Files
- 导出添加字段 · 1fee021d
  朱继来 committed Jul 30, 2018
  
  1fee021d Browse Files