Commits · ba0fe03adf17e988b6fe6905e8d944ab2963f63c · 马博 / test-platform

19 Nov, 2018 2 commits
- zr · ba0fe03a
  赵然 authored Nov 19, 2018
  
  ba0fe03a
- zr · f1e60999
  赵然 authored Nov 19, 2018
  
  f1e60999
16 Nov, 2018 12 commits
- Merge branch 'develop' into zr · abdf6335
  赵然 authored Nov 16, 2018
  
  abdf6335
- Merge branch 'develop' of gitlab2.dui88.com:mabo/test-platform into develop · c73bf836
  赵然 authored Nov 16, 2018
  
  c73bf836
- panyuli · 4ea97b43
  panyuli authored Nov 16, 2018
  
  4ea97b43
- zr · 8f47fb4a
  panyuli authored Nov 16, 2018
  
  8f47fb4a
- panyuli · 828c52e4
  panyuli authored Nov 16, 2018
  
  828c52e4
- Merge branch 'master' into panyuli · 3f5b963f
  panyuli authored Nov 16, 2018
```
# Conflicts:
#	src/test/java/http/cases/ExchangeTest/虚拟商品_兑换异常测试_ExchangeTest.java
```
  3f5b963f
- zr · 6c04673f
  赵然 authored Nov 16, 2018
  
  6c04673f
- Merge branch 'develop' · 0acd24e4
  赵然 authored Nov 16, 2018
  
  0acd24e4
- zr · 663e8c3e
  赵然 authored Nov 16, 2018
  
  663e8c3e
- fix · d423bba5
  马博 authored Nov 16, 2018
  
  d423bba5
- zr · 5b5133cd
  赵然 authored Nov 16, 2018
  
  5b5133cd
- zr · 58ce8cd3
  赵然 authored Nov 16, 2018
  
  58ce8cd3
15 Nov, 2018 19 commits
- zr · 88a487ef
  赵然 authored Nov 15, 2018
  
  88a487ef
- Merge branch 'master' of gitlab2.dui88.com:mabo/test-platform · a1f7764f
  马博 authored Nov 15, 2018
  
  a1f7764f
- duibabase · 1abee1d3
  马博 authored Nov 15, 2018
  
  1abee1d3
- zr · b33446ea
  赵然 authored Nov 15, 2018
  
  b33446ea
- zr · af7530f9
  赵然 authored Nov 15, 2018
  
  af7530f9
- zr · befcd932
  赵然 authored Nov 15, 2018
  
  befcd932
- zr · 68e0a828
  赵然 authored Nov 15, 2018
  
  68e0a828
- zr · 811fb96b
  赵然 authored Nov 15, 2018
  
  811fb96b
- base · 4c16ee62
  马博 authored Nov 15, 2018
  
  4c16ee62
- Merge branch 'master' of gitlab2.dui88.com:mabo/test-platform · 028791c4
  马博 authored Nov 15, 2018
  
  028791c4
- 框架优化，suite支持@Autowire · d6745cf8
  马博 authored Nov 15, 2018
  
  d6745cf8
- zr · 71c3ec7d
  赵然 authored Nov 15, 2018
  
  71c3ec7d
- zr · e907acd2
  赵然 authored Nov 15, 2018
  
  e907acd2
- zr · 8c2eba8b
  赵然 authored Nov 15, 2018
  
  8c2eba8b
- zr · 376f9a1d
  赵然 authored Nov 15, 2018
  
  376f9a1d
- Merge branch 'master' into zr · f59e4c6c
  赵然 authored Nov 15, 2018
  
  f59e4c6c
- zr · a214f342
  赵然 authored Nov 15, 2018
  
  a214f342
- Q3,Q4bug的覆盖以及虚拟商品用例积分不足，库存不足以及用户的永久兑换 · a1215f12
  panyuli authored Nov 15, 2018
  
  a1215f12
- zr · c4428d60
  赵然 authored Nov 15, 2018
  
  c4428d60
14 Nov, 2018 7 commits
- Merge branch 'develop' · cda1dcfc
  赵然 authored Nov 14, 2018
  
  cda1dcfc
- zr · b620a880
  赵然 authored Nov 14, 2018
  
  b620a880
- Merge branch 'master' of gitlab2.dui88.com:mabo/test-platform · 1f2a25f7
  赵然 authored Nov 14, 2018
  
  1f2a25f7
- Merge branch 'master' into develop · 39fcf9fa
  赵然 authored Nov 14, 2018
  
  39fcf9fa
- zr · 800b94a7
  赵然 authored Nov 14, 2018
  
  800b94a7
- Merge branch 'hmx' into develop · 3ab9ce8e
  chenjianfang authored Nov 14, 2018
  
  3ab9ce8e
- hmx · d10c0d3c
  chenjianfang authored Nov 14, 2018
  
  d10c0d3c