Commits · 81734d952d47b6587dfc640e590eda6c936c6596 · 罗超 / SuperMan

15 Mar, 2019 22 commits
- 解决提交冲突 · 81734d95
  华国豪 authored Mar 15, 2019
  
  81734d95
- 新增图片裁剪 · 9f5c021b
  华国豪 authored Mar 15, 2019
  
  9f5c021b
- 122121 · b1e81391
  黄奎 authored Mar 15, 2019
  
  b1e81391
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 66b617dc
  zhengke authored Mar 15, 2019
  
  66b617dc
- 修改旅客名单 · d06e767c
  zhengke authored Mar 15, 2019
  
  d06e767c
- 领队报账 · 1e8f510c
  吴春 authored Mar 15, 2019
  
  1e8f510c
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · cdcd7750
  王悦 authored Mar 15, 2019
  
  cdcd7750
- 资金调拨单下一步审核人、审核步骤没显示 · a41a7f4a
  王悦 authored Mar 15, 2019
  
  a41a7f4a
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · df5ec941
  黄奎 authored Mar 15, 2019
  
  df5ec941
- 新增航班状态判断 · 95754cca
  黄奎 authored Mar 15, 2019
  
  95754cca
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 27b01da4
  huangyuanyuan authored Mar 15, 2019
  
  27b01da4
- 资金调拨详情 · fe32cf66
  huangyuanyuan authored Mar 15, 2019
  
  fe32cf66
- 修改提示样式 · e5fa0224
  zhengke authored Mar 15, 2019
  
  e5fa0224
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · dbfd1142
  huangyuanyuan authored Mar 15, 2019
  
  dbfd1142
- 订单拆分 · 11ce2fa5
  huangyuanyuan authored Mar 15, 2019
  
  11ce2fa5
- 资金调拨 · e71674bd
  王悦 authored Mar 15, 2019
  
  e71674bd
- 团控代码优化 · 5258ba63
  黄奎 authored Mar 15, 2019
  
  5258ba63
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · a8b8f5ec
  黄奎 authored Mar 15, 2019
  
  a8b8f5ec
- 团控代码优化 · d7fe72f4
  黄奎 authored Mar 15, 2019
  
  d7fe72f4
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · a6bc1076
  zhengke authored Mar 15, 2019
  
  a6bc1076
- 增加跳转参数 · ac896bc9
  zhengke authored Mar 15, 2019
  
  ac896bc9
- 在途金额修正 · 4e1cf046
  liudong1993 authored Mar 15, 2019
  
  4e1cf046
14 Mar, 2019 18 commits
- no message · c91b0395
  王悦 authored Mar 14, 2019
  
  c91b0395
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 519b442f
  华国豪 authored Mar 14, 2019
  
  519b442f
- 1 · 681e3a20
  华国豪 authored Mar 14, 2019
  
  681e3a20
- 资金调拨单 · 6a1dea69
  王悦 authored Mar 14, 2019
  
  6a1dea69
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 6868addc
  华国豪 authored Mar 14, 2019
  
  6868addc
- no message · 575df541
  王悦 authored Mar 14, 2019
  
  575df541
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · a9cf4119
  华国豪 authored Mar 14, 2019
  
  a9cf4119
- 团报-联运成本 · bda9560e
  王悦 authored Mar 14, 2019
  
  bda9560e
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 93d576af
  王悦 authored Mar 14, 2019
  
  93d576af
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 3be5d2f4
  huangyuanyuan authored Mar 14, 2019
  
  3be5d2f4
- 修改部分弹窗 · e4362493
  huangyuanyuan authored Mar 14, 2019
  
  e4362493
- 1 · eb7c7491
  华国豪 authored Mar 14, 2019
  
  eb7c7491
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · ded6306e
  黄奎 authored Mar 14, 2019
  
  ded6306e
- 新增对内备注 · c3089ea2
  黄奎 authored Mar 14, 2019
  
  c3089ea2
- 1 · d9ec5abd
  华国豪 authored Mar 14, 2019
  
  d9ec5abd
- 修改上传@ · 523116ec
  华国豪 authored Mar 14, 2019
  
  523116ec
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 09c344a3
  zhengke authored Mar 14, 2019
  
  09c344a3
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · c96c77e3
  zhengke authored Mar 14, 2019
```
# Conflicts:
#	src/components/SalesVisa/VisaProduct.vue
```
  c96c77e3