Commits · 7675f68a9c96a4ce8e1c044b6c48333f0f7c3c1d · 罗超 / SuperMan

07 Mar, 2019 35 commits
- js修改 · 7675f68a
  黄奎 authored Mar 07, 2019
  
  7675f68a
- 1 · a5330127
  华国豪 authored Mar 07, 2019
  
  a5330127
- 修改java 线上地址 · 02e4b00e
  华国豪 authored Mar 07, 2019
  
  02e4b00e
- 散卖机票订单 · f86b3a7b
  huangyuanyuan authored Mar 07, 2019
  
  f86b3a7b
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 8981d06e
  huangyuanyuan authored Mar 07, 2019
  
  8981d06e
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 52dafd84
  王悦 authored Mar 07, 2019
  
  52dafd84
- 国内票务权限控制 · 5cf8310a
  王悦 authored Mar 07, 2019
  
  5cf8310a
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 0a7e48aa
  吴春 authored Mar 07, 2019
  
  0a7e48aa
- 房间预订数为0的时候默认房间数 · feee1933
  吴春 authored Mar 07, 2019
  
  feee1933
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · d4ef5c76
  华国豪 authored Mar 07, 2019
  
  d4ef5c76
- 1 · 1d3529fa
  华国豪 authored Mar 07, 2019
  
  1d3529fa
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · da7fb096
  王悦 authored Mar 07, 2019
  
  da7fb096
- 单据详情外币总金额，原币总金额显示 · 69453363
  王悦 authored Mar 07, 2019
  
  69453363
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 5e3dc7e0
  华国豪 authored Mar 07, 2019
  
  5e3dc7e0
- 1 · 62bacfc3
  华国豪 authored Mar 07, 2019
  
  62bacfc3
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · b4cc3e52
  liudong1993 authored Mar 07, 2019
  
  b4cc3e52
- 方法重叠了 · a8930d8d
  liudong1993 authored Mar 07, 2019
  
  a8930d8d
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 51412b57
  huangyuanyuan authored Mar 07, 2019
```
# Conflicts:
#	src/plug/index.js
```
  51412b57
- 散客机票 · d1842968
  huangyuanyuan authored Mar 07, 2019
  
  d1842968
- 修改酒店对应的团的信息 · a4d74ac9
  吴春 authored Mar 07, 2019
  
  a4d74ac9
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 501ab988
  zhengke authored Mar 07, 2019
  
  501ab988
- 2 · bad79d12
  zhengke authored Mar 07, 2019
  
  bad79d12
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 82696862
  华国豪 authored Mar 07, 2019
  
  82696862
- ‘提交修改’ · 9e1aa3ca
  华国豪 authored Mar 07, 2019
  
  9e1aa3ca
- 团队收支修改 · 96fd3fea
  黄奎 authored Mar 07, 2019
  
  96fd3fea
- s · c2780e09
  zhengke authored Mar 07, 2019
  
  c2780e09
- no message · defb3899
  zhengke authored Mar 07, 2019
  
  defb3899
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · d99ad5d5
  zhengke authored Mar 07, 2019
  
  d99ad5d5
- s · 826230b8
  zhengke authored Mar 07, 2019
  
  826230b8
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · c8a8093b
  黄奎 authored Mar 07, 2019
  
  c8a8093b
- api地址修改 · 6be6b905
  黄奎 authored Mar 07, 2019
  
  6be6b905
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 82e22106
  华国豪 authored Mar 07, 2019
  
  82e22106
- 1 · 7502ad8a
  华国豪 authored Mar 07, 2019
  
  7502ad8a
- no message · b7103bd8
  zhengke authored Mar 07, 2019
  
  b7103bd8
- 2 · ff7e65d3
  zhengke authored Mar 07, 2019
  
  ff7e65d3
06 Mar, 2019 5 commits
- 销售统计提成 · ebd84904
  liudong1993 authored Mar 06, 2019
  
  ebd84904
- 散客订单 · baa19b1a
  huangyuanyuan authored Mar 06, 2019
  
  baa19b1a
- 简易报表跳转界面 · 74536407
  王悦 authored Mar 06, 2019
  
  74536407
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · debc51b9
  王悦 authored Mar 06, 2019
  
  debc51b9
- 简易报表 · dc48e3fb
  王悦 authored Mar 06, 2019
  
  dc48e3fb