Commits · 9953eb5c03b72d67ab920be60e147eb9fca5fb33 · 罗超 / SuperMan

05 Aug, 2019 23 commits
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 9953eb5c
  zhengke authored Aug 05, 2019
  
  9953eb5c
- 修改冲突样式 · ab4dffb1
  zhengke authored Aug 05, 2019
  
  ab4dffb1
- 页面修改 · ea7789da
  黄奎 authored Aug 05, 2019
  
  ea7789da
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 2682482a
  黄奎 authored Aug 05, 2019
  
  2682482a
- 页面修改 · 698a8115
  黄奎 authored Aug 05, 2019
  
  698a8115
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 6c56f569
  华国豪 authored Aug 05, 2019
  
  6c56f569
- 还原冲突掉代码 · 9ba826c2
  华国豪 authored Aug 05, 2019
  
  9ba826c2
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · e48d13b4
  黄媛媛 authored Aug 05, 2019
  
  e48d13b4
- 屏蔽临时导游 · 36f4bdd9
  黄媛媛 authored Aug 05, 2019
  
  36f4bdd9
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · d7e17a91
  华国豪 authored Aug 05, 2019
  
  d7e17a91
- 领队报账 · d287609b
  华国豪 authored Aug 05, 2019
  
  d287609b
- 页面修改 · dadbd822
  黄奎 authored Aug 05, 2019
  
  dadbd822
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · c9277772
  华国豪 authored Aug 05, 2019
  
  c9277772
- 付款可负数，意见调查详情修改 · 076536ab
  华国豪 authored Aug 05, 2019
  
  076536ab
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · ef141874
  黄奎 authored Aug 05, 2019
  
  ef141874
- 餐厅新增重复验证 · 8ac818a1
  黄奎 authored Aug 05, 2019
  
  8ac818a1
- 领队用款计划景点酒店餐厅的单价显示修改 · c53a0050
  吴春 authored Aug 05, 2019
  
  c53a0050
- 门票保存新增验证重复 · d4a3dec4
  黄奎 authored Aug 05, 2019
  
  d4a3dec4
- 新增返佣统计 · 3e29453e
  黄奎 authored Aug 05, 2019
  
  3e29453e
- 1 · 500295e6
  华国豪 authored Aug 05, 2019
  
  500295e6
- 明细 · 587b3fa5
  华国豪 authored Aug 05, 2019
  
  587b3fa5
- update · d3157148
  黄媛媛 authored Aug 05, 2019
  
  d3157148
- 添加明细 · 0543fc16
  黄媛媛 authored Aug 05, 2019
  
  0543fc16
02 Aug, 2019 17 commits
- 111 · 53775990
  华国豪 authored Aug 02, 2019
  
  53775990
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 1dc691be
  华国豪 authored Aug 02, 2019
  
  1dc691be
- 新增追加团款 · 9a535913
  华国豪 authored Aug 02, 2019
  
  9a535913
- 样式修改 · a1755a8d
  黄奎 authored Aug 02, 2019
  
  a1755a8d
- update · 814ae574
  黄媛媛 authored Aug 02, 2019
  
  814ae574
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · beaca4fe
  黄媛媛 authored Aug 02, 2019
  
  beaca4fe
- 产品查询增加行业类型 · 58c88cf5
  黄媛媛 authored Aug 02, 2019
  
  58c88cf5
- 其他收入统计 · b91e9b98
  liudong1993 authored Aug 02, 2019
  
  b91e9b98
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 2d84b799
  黄媛媛 authored Aug 02, 2019
  
  2d84b799
- update · 721a4c40
  黄媛媛 authored Aug 02, 2019
  
  721a4c40
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · ea07231f
  华国豪 authored Aug 02, 2019
  
  ea07231f
- 酒店门票详情~！ · 6d950ead
  华国豪 authored Aug 02, 2019
  
  6d950ead
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · ff67d13d
  黄奎 authored Aug 02, 2019
  
  ff67d13d
- 新增景点统计下载 · 160234dc
  黄奎 authored Aug 02, 2019
  
  160234dc
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 69b9dbe0
  黄媛媛 authored Aug 02, 2019
  
  69b9dbe0
- update · f5f7a604
  黄媛媛 authored Aug 02, 2019
  
  f5f7a604
- 修改一下 · c5fec6c7
  华国豪 authored Aug 02, 2019
  
  c5fec6c7