Commits · badd9d86719bb453694afb2acd2fb1c8e6bbd77e · youjj / cloud-platform

29 Aug, 2019 24 commits
- 123 · badd9d86
  jiaorz authored Aug 29, 2019
  
  badd9d86
- 123 · 36038bed
  jiaorz authored Aug 29, 2019
  
  36038bed
- Merge remote-tracking branch 'origin/base-modify' into base-modify · e6547f44
  jiaorz authored Aug 29, 2019
  
  e6547f44
- 123 · 160887f3
  jiaorz authored Aug 29, 2019
  
  160887f3
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into dev-hf · a54d4d50
  hanfeng authored Aug 29, 2019
  
  a54d4d50
- 修改新闻接口 · 143b6202
  hanfeng authored Aug 29, 2019
  
  143b6202
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 728931ba
  jiaorz authored Aug 29, 2019
  
  728931ba
- Merge remote-tracking branch 'remotes/origin/dev' into base-modify · f6f93ed0
  jiaorz authored Aug 29, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
```
  f6f93ed0
- Merge remote-tracking branch 'origin/dev' into jrz_dev · d74c428f
  jiaorz authored Aug 29, 2019
  
  d74c428f
- 123 · c1e556cc
  jiaorz authored Aug 29, 2019
  
  c1e556cc
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 2e908704
  hezhen authored Aug 29, 2019
  
  2e908704
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · dc7c171f
  hezhen authored Aug 29, 2019
  
  dc7c171f
- 123 · 9c7100a2
  hezhen authored Aug 29, 2019
  
  9c7100a2
- Merge branch 'dev' into base-modify · 37ffbbcb
  周健威 authored Aug 29, 2019
  
  37ffbbcb
- 修改代码 · 1c1f1dfa
  周健威 authored Aug 29, 2019
  
  1c1f1dfa
- 修改代码 · 0d2def14
  周健威 authored Aug 29, 2019
  
  0d2def14
- Merge branch 'dev' into base-modify · dffdb92b
  周健威 authored Aug 29, 2019
  
  dffdb92b
- 修改代码 · 647bcc2b
  周健威 authored Aug 29, 2019
  
  647bcc2b
- Merge branch 'dev' into base-modify · bf2fdeb7
  周健威 authored Aug 29, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
```
  bf2fdeb7
- Merge remote-tracking branch 'origin/dev' into dev · c4c48db5
  libin authored Aug 29, 2019
  
  c4c48db5
- 调度调整 · 819d7972
  libin authored Aug 29, 2019
  
  819d7972
- Merge remote-tracking branch 'remotes/origin/dev' into base-modify · 851a07f8
  hanfeng authored Aug 29, 2019
  
  851a07f8
- Merge remote-tracking branch 'origin/dev' into jrz_dev · e34a984d
  jiaorz authored Aug 29, 2019
  
  e34a984d
- Merge branch 'master' into jrz_dev · 510df3b2
  jiaorz authored Aug 29, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
```
  510df3b2
28 Aug, 2019 16 commits
- 123 · 7b3f89b5
  jiaorz authored Aug 28, 2019
  
  7b3f89b5
- 123 · a996cd4e
  jiaorz authored Aug 28, 2019
  
  a996cd4e
- 123 · b81c8ccd
  jiaorz authored Aug 28, 2019
  
  b81c8ccd
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 89266e66
  jiaorz authored Aug 28, 2019
  
  89266e66
- 123 · d6956196
  jiaorz authored Aug 28, 2019
  
  d6956196
- Merge remote-tracking branch 'remotes/origin/master-bug' · f8684d3c
  hezhen authored Aug 28, 2019
  
  f8684d3c
- Merge remote-tracking branch 'origin/dev' into dev · 76e8998f
  libin authored Aug 28, 2019
  
  76e8998f
- 活动列表 · 6e556be8
  libin authored Aug 28, 2019
  
  6e556be8
- 123 · 50ac86b9
  jiaorz authored Aug 28, 2019
  
  50ac86b9
- 活动列表 · a11363b6
  libin authored Aug 28, 2019
  
  a11363b6
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 42b35c8a
  libin authored Aug 28, 2019
  
  42b35c8a
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · c5d5c1b9
  hanfeng authored Aug 28, 2019
  
  c5d5c1b9
- 修改新闻系列接口 · b4e5d8e5
  hanfeng authored Aug 28, 2019
  
  b4e5d8e5
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 2a9f6aa9
  hezhen authored Aug 28, 2019
  
  2a9f6aa9
- Merge branch 'dev' into base-modify · 18b5d767
  hezhen authored Aug 28, 2019
  
  18b5d767
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 7b982fef
  hezhen authored Aug 28, 2019
```
# Conflicts:
#	xx-uccn/xx-uccn-server/pom.xml
```
  7b982fef