Commits · 68366f074592b558bd22411f4b771e1164d7cd4a · 罗超 / SuperMan

26 Mar, 2019 40 commits
- 提价修改 · 68366f07
  华国豪 authored Mar 26, 2019
  
  68366f07
- 冲突解决 · 6bb0e749
  123zhang authored Mar 26, 2019
  
  6bb0e749
- 52 · 14ddf788
  123zhang authored Mar 26, 2019
  
  14ddf788
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 1ad2ac39
  华国豪 authored Mar 26, 2019
  
  1ad2ac39
- 修改贴胶 · 7ead6b40
  华国豪 authored Mar 26, 2019
  
  7ead6b40
- 添加文件 · 3a28bde4
  huangyuanyuan authored Mar 26, 2019
  
  3a28bde4
- update · ae0932bd
  huangyuanyuan authored Mar 26, 2019
  
  ae0932bd
- 修改签证看板详情 · 5aa24feb
  huangyuanyuan authored Mar 26, 2019
  
  5aa24feb
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · a67b4ece
  华国豪 authored Mar 26, 2019
  
  a67b4ece
- 冲突. · 06058588
  华国豪 authored Mar 26, 2019
  
  06058588
- 车辆修改 · 3a615393
  黄奎 authored Mar 26, 2019
  
  3a615393
- 11 · 236b8ad2
  黄奎 authored Mar 26, 2019
  
  236b8ad2
- 车辆修改 · 87025d5f
  黄奎 authored Mar 26, 2019
  
  87025d5f
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · baf76341
  华国豪 authored Mar 26, 2019
  
  baf76341
- ‘duoyuyan’ · 391e81aa
  华国豪 authored Mar 26, 2019
  
  391e81aa
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · a3c2a804
  zhengke authored Mar 26, 2019
  
  a3c2a804
- 修改样式 · bd31853b
  zhengke authored Mar 26, 2019
  
  bd31853b
- update · 6f2df67d
  huangyuanyuan authored Mar 26, 2019
  
  6f2df67d
- update · 3eef6579
  huangyuanyuan authored Mar 26, 2019
  
  3eef6579
- 增加样式 · 03c13027
  zhengke authored Mar 26, 2019
  
  03c13027
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 9629af2d
  黄奎 authored Mar 26, 2019
  
  9629af2d
- 车辆修改 · 12da32e7
  黄奎 authored Mar 26, 2019
  
  12da32e7
- 修改跳转所带参数 · 20f67cee
  zhengke authored Mar 26, 2019
  
  20f67cee
- 增加国际化和酒店餐厅预览大图 · f3cfa2b1
  zhengke authored Mar 26, 2019
  
  f3cfa2b1
- xsb · 656cec37
  华国豪 authored Mar 26, 2019
  
  656cec37
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · a23fa943
  华国豪 authored Mar 26, 2019
  
  a23fa943
- guojihua · ab16030e
  华国豪 authored Mar 26, 2019
  
  ab16030e
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 8d1adbdb
  黄奎 authored Mar 26, 2019
  
  8d1adbdb
- 开始时间结束时间修改 · 227153be
  黄奎 authored Mar 26, 2019
  
  227153be
- 提交zh.js · 9d6500b2
  华国豪 authored Mar 26, 2019
  
  9d6500b2
- 财务多语言 · 96bfdab0
  华国豪 authored Mar 26, 2019
  
  96bfdab0
- 解决冲突 · 67623ff2
  huangyuanyuan authored Mar 26, 2019
  
  67623ff2
- 1111 · 88d0e50b
  huangyuanyuan authored Mar 26, 2019
  
  88d0e50b
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · f6adb3dc
  huangyuanyuan authored Mar 26, 2019
```
# Conflicts:
#	src/assets/common/lang/zh.js
#	src/components/SalesModule/VisaFinancialDocuments.vue
#	src/components/SalesModule/groupInquiry.vue
```
  f6adb3dc
- 再次增加上传 · 44c3aa9f
  zhengke authored Mar 26, 2019
  
  44c3aa9f
- 修改 · 24713947
  huangyuanyuan authored Mar 26, 2019
  
  24713947
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · b3f6e99e
  qiaoyajun authored Mar 26, 2019
  
  b3f6e99e
- 修改查询类型 · 79959c22
  qiaoyajun authored Mar 26, 2019
  
  79959c22
- 恢复版本 · b3213b62
  华国豪 authored Mar 26, 2019
  
  b3213b62
- 1 · bf136061
  华国豪 authored Mar 26, 2019
  
  bf136061