Commits · 48d2687ddee558e799983da9c0fa4e58dd57dd20 · youjj / cloud-platform

29 Aug, 2019 14 commits
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 48d2687d
  hezhen authored Aug 29, 2019
  
  48d2687d
- 123 · 5e46a5f3
  hezhen authored Aug 29, 2019
  
  5e46a5f3
- 调度调整 · ff56d131
  libin authored Aug 29, 2019
  
  ff56d131
- 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 '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
- 修改代码 · 1c1f1dfa
  周健威 authored Aug 29, 2019
  
  1c1f1dfa
- 修改代码 · 0d2def14
  周健威 authored Aug 29, 2019
  
  0d2def14
- 修改代码 · 647bcc2b
  周健威 authored Aug 29, 2019
  
  647bcc2b
- 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 '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 26 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 '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
- 123 · c802500d
  hezhen authored Aug 28, 2019
  
  c802500d
- Merge branch 'dev' into base-modify · 882172b0
  周健威 authored Aug 28, 2019
  
  882172b0
- Merge branch 'dev-hf' into dev · b8e17fae
  hanfeng authored Aug 28, 2019
  
  b8e17fae
- 活动列表 · 6e293b5f
  libin authored Aug 28, 2019
  
  6e293b5f
- 修改代码 · 987a0e2c
  周健威 authored Aug 28, 2019
  
  987a0e2c
- 修改新闻系列接口 · 02a6544f
  hanfeng authored Aug 28, 2019
  
  02a6544f
- 123 · a5b3b749
  jiaorz authored Aug 28, 2019
  
  a5b3b749
- 123 · 31617c7b
  jiaorz authored Aug 28, 2019
  
  31617c7b
- 123 · 005c4535
  jiaorz authored Aug 28, 2019
  
  005c4535
- 123 · 32cd3ebf
  jiaorz authored Aug 28, 2019
  
  32cd3ebf
- 123 · 42c89a7b
  jiaorz authored Aug 28, 2019
  
  42c89a7b
- 123 · 3b6f76a8
  jiaorz authored Aug 28, 2019
  
  3b6f76a8