Commits · 60da574bdd9a31035592ccaf2f0e397980156dd6 · zhujilai / 后台订单管理 · GitLab

24 May, 2018 6 commits
- Merge branch 'zjl_adjust_20180507' into development · 60da574b
  朱继来 committed May 24, 2018
  
  60da574b Browse Files
- 修复导出 · e3194631
  朱继来 committed May 24, 2018
  
  e3194631 Browse Files
- Merge branch 'zjl_action_log_20180521' into development · acc6732c
  朱继来 committed May 24, 2018
  
  acc6732c Browse Files
- 调整显示宽度 · 2b782186
  朱继来 committed May 24, 2018
  
  2b782186 Browse Files
- Merge branch 'zjl_action_log_20180521' into development · 0d616e02
  朱继来 committed May 24, 2018
  
  0d616e02 Browse Files
- 调整定时任务和同步 · 71e7918e
  朱继来 committed May 24, 2018
  
  71e7918e Browse Files
23 May, 2018 6 commits
- Merge branch 'zjl_action_log_20180521' into development · b1448d3d
  朱继来 committed May 23, 2018
  
  b1448d3d Browse Files
- 定时任务注释测试订单 · fe26a315
  朱继来 committed May 23, 2018
  
  fe26a315 Browse Files
- Merge branch 'zjl_action_log_20180521' into development · 82f01737
  朱继来 committed May 23, 2018
  
  82f01737 Browse Files
- 再次调价添加操作事件 · 7a80289d
  朱继来 committed May 23, 2018
  
  7a80289d Browse Files
- Merge branch 'zjl_action_log_20180521' into development · 5dcee4d6
  朱继来 committed May 23, 2018
  
  5dcee4d6 Browse Files
- 自营去掉erp_order_id · e497d5ad
  朱继来 committed May 23, 2018
  
  e497d5ad Browse Files
22 May, 2018 6 commits
- Merge branch 'zjl_action_log_20180521' into development · bcf4bf6c
  朱继来 committed May 22, 2018
  
  bcf4bf6c Browse Files
- 添加判断 · e17f10b0
  朱继来 committed May 22, 2018
  
  e17f10b0 Browse Files
- 修改操作人 · afe1b3c0
  朱继来 committed May 22, 2018
  
  afe1b3c0 Browse Files
- 添加操作记录 · c756a464
  朱继来 committed May 22, 2018
  
  c756a464 Browse Files
- 去掉同步状态 · 85b42256
  朱继来 committed May 22, 2018
  
  85b42256 Browse Files
- 添加快递信息 · 25060136
  朱继来 committed May 22, 2018
  
  25060136 Browse Files
21 May, 2018 3 commits
- 添加操作记录 · 9b9e843d
  朱继来 committed May 21, 2018
  
  9b9e843d Browse Files
- Merge branch 'zjl_add_perm_20180521' into development · d46afb17
  朱继来 committed May 21, 2018
  
  d46afb17 Browse Files
- 添加推送权限 · b6df2819
  朱继来 committed May 21, 2018
  
  b6df2819
18 May, 2018 4 commits
- Merge branch 'zjl_self_order_20180502' into development · a2944af9
  朱继来 committed May 18, 2018
  
  a2944af9 Browse Files
- 自营去掉同步状态 · c1e68635
  朱继来 committed May 18, 2018
  
  c1e68635 Browse Files
- fix conflict · c42dd9e4
  朱继来 committed May 18, 2018
  
  c42dd9e4 Browse Files
- 添加快递配置 · 30da12e8
  朱继来 committed May 18, 2018
  
  30da12e8
17 May, 2018 15 commits
- Merge branch 'zjl_self_order_20180502' · 6cad6d9f
  朱继来 committed May 17, 2018
  
  6cad6d9f
- Merge branch 'zjl_self_order_20180502' into development · bf11d352
  朱继来 committed May 17, 2018
  
  bf11d352 Browse Files
- 调整填写快递单 · 62a3c1c7
  朱继来 committed May 17, 2018
  
  62a3c1c7
- Merge branch 'zjl_adjust_20180507' · 3ece1b25
  朱继来 committed May 17, 2018
  
  3ece1b25 Browse Files
- Merge branch 'zjl_adjust_20180507' into development · 76121af5
  朱继来 committed May 17, 2018
  
  76121af5 Browse Files
- 添加推送业务员JS · 467bc060
  朱继来 committed May 17, 2018
  
  467bc060 Browse Files
- Merge branch 'zjl_self_order_20180502' · d3fb9080
  朱继来 committed May 17, 2018
  
  d3fb9080 Browse Files
- Merge branch 'zjl_self_order_20180502' into development · 5d266386
  朱继来 committed May 17, 2018
  
  5d266386 Browse Files
- 调整订单总额 · 9c2e9243
  朱继来 committed May 17, 2018
  
  9c2e9243 Browse Files
- Merge branch 'zjl_adjust_20180507' into development · 45eb7c31
  朱继来 committed May 17, 2018
  
  45eb7c31 Browse Files
- 修复 · b2477889
  朱继来 committed May 17, 2018
  
  b2477889
- fix conflict · ff5ca46a
  朱继来 committed May 17, 2018
  
  ff5ca46a Browse Files
- fix conflict · 6a6d2739
  朱继来 committed May 17, 2018
  
  6a6d2739 Browse Files
- Merge branch 'zjl_self_order_20180502' into development · 49ce2f07
  朱继来 committed May 17, 2018
  
  49ce2f07 Browse Files
- 自营订单导出时添加运费 · 91855c2a
  朱继来 committed May 17, 2018
  
  91855c2a Browse Files