Commits · 3b6f76a8e1f8cd5c6c80f5f8a82e34efc55588df · youjj / cloud-platform

28 Aug, 2019 18 commits
- 123 · 3b6f76a8
  jiaorz authored Aug 28, 2019
  
  3b6f76a8
- 123 · ce57a67e
  jiaorz authored Aug 28, 2019
  
  ce57a67e
- 123 · abc54345
  jiaorz authored Aug 28, 2019
  
  abc54345
- 123 · ab37d105
  jiaorz authored Aug 28, 2019
  
  ab37d105
- 123 · 52828e25
  jiaorz authored Aug 28, 2019
  
  52828e25
- Merge remote-tracking branch 'origin/base-modify' into base-modify · ec770b7e
  jiaorz authored Aug 28, 2019
  
  ec770b7e
- Merge branch 'jrz_dev' into base-modify · 71243df6
  jiaorz authored Aug 28, 2019
  
  71243df6
- Merge remote-tracking branch 'origin/dev' into jrz_dev · a4752a80
  jiaorz authored Aug 28, 2019
```
# Conflicts:
#	xx-uccn/xx-uccn-server/pom.xml
```
  a4752a80
- 123 · 5240f601
  jiaorz authored Aug 28, 2019
  
  5240f601
- Merge branch 'dev' into base-modify · 7bacb64c
  libin authored Aug 28, 2019
  
  7bacb64c
- Merge remote-tracking branch 'origin/dev' into dev · 2d58cd6c
  libin authored Aug 28, 2019
  
  2d58cd6c
- 营地uccn · f10cdc2f
  libin authored Aug 28, 2019
  
  f10cdc2f
- Merge remote-tracking branch 'origin/base-modify' into base-modify · b79308f3
  jiaorz authored Aug 28, 2019
  
  b79308f3
- Merge remote-tracking branch 'remotes/origin/dev' into base-modify · bdc89a21
  jiaorz authored Aug 28, 2019
  
  bdc89a21
- Merge remote-tracking branch 'origin/dev' into jrz_dev · d44b90ac
  jiaorz authored Aug 28, 2019
  
  d44b90ac
- 123 · 8bb649df
  jiaorz authored Aug 28, 2019
  
  8bb649df
- banner 添加字段platform · 74099990
  libin authored Aug 28, 2019
  
  74099990
- banner 添加字段platform · be1df259
  libin authored Aug 28, 2019
  
  be1df259
27 Aug, 2019 22 commits
- Merge branch 'lb_dev' into base-modify · 910bce66
  libin authored Aug 27, 2019
  
  910bce66
- Merge branch 'dev' into lb_dev · 3fe5d68a
  libin authored Aug 27, 2019
  
  3fe5d68a
- summit activity · e07436f7
  libin authored Aug 27, 2019
  
  e07436f7
- 123 · 3b178552
  jiaorz authored Aug 27, 2019
  
  3b178552
- Merge remote-tracking branch 'origin/dev' into jrz_dev · f0b953ce
  jiaorz authored Aug 27, 2019
  
  f0b953ce
- 123 · a2cc1f5c
  jiaorz authored Aug 27, 2019
  
  a2cc1f5c
- Merge branch 'dev' into base-modify · 5aef09c4
  libin authored Aug 27, 2019
  
  5aef09c4
- Merge branch 'dev' into lb_dev · 2caf93e1
  libin authored Aug 27, 2019
  
  2caf93e1
- summit activity · c6391f39
  libin authored Aug 27, 2019
  
  c6391f39
- Merge branch 'master-bug-rent' into dev · a529a501
  周健威 authored Aug 27, 2019
  
  a529a501
- 修复跨月查询bug · 4b9fb228
  周健威 authored Aug 27, 2019
  
  4b9fb228
- Merge branch 'master-bug-rent' into dev · 27e82649
  周健威 authored Aug 27, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
```
  27e82649
- 修复跨月查询bug · 2962da62
  周健威 authored Aug 27, 2019
  
  2962da62
- 123 · ad1c33e0
  hezhen authored Aug 27, 2019
  
  ad1c33e0
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · f1394076
  hezhen authored Aug 27, 2019
  
  f1394076
- 123 · dbc83694
  hezhen authored Aug 27, 2019
  
  dbc83694
- Merge branch 'dev' into base-modify · 8fad7fb7
  libin authored Aug 27, 2019
  
  8fad7fb7
- Merge remote-tracking branch 'origin/dev' into dev · 01dc4858
  libin authored Aug 27, 2019
  
  01dc4858
- summit activity · b3b16c21
  libin authored Aug 27, 2019
  
  b3b16c21
- 123 · adfa0298
  hezhen authored Aug 27, 2019
  
  adfa0298
- Merge branch 'hz_master' into dev · 9b7c9795
  hezhen authored Aug 27, 2019
  
  9b7c9795
- Merge remote-tracking branch 'origin/dev' into dev · 7252f25a
  周健威 authored Aug 27, 2019
  
  7252f25a