Commits · 3a0522053bf4dad35f7ffa2dcb00e58bc15a7cd3 · youjj / cloud-platform

31 Aug, 2019 1 commit
- 上传包的修改 · 3a052205
  libin authored Aug 31, 2019
  
  3a052205
30 Aug, 2019 26 commits
- Merge remote-tracking branch 'origin/dev' into dev · 65362f81
  hanfeng authored Aug 30, 2019
  
  65362f81
- 修改新闻接口 · ad97f753
  hanfeng authored Aug 30, 2019
  
  ad97f753
- 修改代码 · b6172a51
  周健威 authored Aug 30, 2019
  
  b6172a51
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 97889578
  jiaorz authored Aug 30, 2019
  
  97889578
- 修改出车bug · a955cc3d
  jiaorz authored Aug 30, 2019
  
  a955cc3d
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · ed630904
  hezhen authored Aug 30, 2019
  
  ed630904
- 123 · 874f5eff
  hezhen authored Aug 30, 2019
  
  874f5eff
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 0af95d09
  hanfeng authored Aug 30, 2019
  
  0af95d09
- 修改新闻接口 · 1da7424b
  hanfeng authored Aug 30, 2019
  
  1da7424b
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 82a203b8
  hezhen authored Aug 30, 2019
  
  82a203b8
- Merge branch 'hz_master' into dev · 5f08289a
  hezhen authored Aug 30, 2019
  
  5f08289a
- 123 · ac0879fa
  hezhen authored Aug 30, 2019
  
  ac0879fa
- Merge remote-tracking branch 'origin/dev' into dev · ebd31ce4
  hanfeng authored Aug 30, 2019
  
  ebd31ce4
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 6d7c161a
  jiaorz authored Aug 30, 2019
  
  6d7c161a
- 修改出车bug · 1f08330d
  jiaorz authored Aug 30, 2019
  
  1f08330d
- Merge branch 'dev' into hz_dev · ef4f04d0
  hezhen authored Aug 30, 2019
  
  ef4f04d0
- 123 · cf6dedc5
  hezhen authored Aug 30, 2019
  
  cf6dedc5
- Merge remote-tracking branch 'origin/dev' into dev · 91fd84dc
  libin authored Aug 30, 2019
  
  91fd84dc
- 活动 · 4ddcbab7
  libin authored Aug 30, 2019
  
  4ddcbab7
- Merge remote-tracking branch 'origin/dev' into jrz_dev · 94e547ba
  jiaorz authored Aug 30, 2019
  
  94e547ba
- 123 · c95c1c5f
  jiaorz authored Aug 30, 2019
  
  c95c1c5f
- Merge branch 'hz_master' into dev · 6c69079a
  hezhen authored Aug 30, 2019
  
  6c69079a
- 123 · 01deb565
  hezhen authored Aug 30, 2019
  
  01deb565
- Merge branch 'hz_master' into dev · cd1d4515
  hezhen authored Aug 30, 2019
  
  cd1d4515
- Merge branch 'master' into hz_master · 2ee3ba51
  hezhen authored Aug 30, 2019
  
  2ee3ba51
- 123 · c155be8c
  hezhen authored Aug 30, 2019
  
  c155be8c
29 Aug, 2019 13 commits
- 修改代码 · 2baf6a63
  周健威 authored Aug 29, 2019
  
  2baf6a63
- 修改代码 · 694b91c9
  周健威 authored Aug 29, 2019
  
  694b91c9
- 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
- 123 · 1f04c7a6
  hezhen authored Aug 29, 2019
  
  1f04c7a6
- 调度调整 · ff56d131
  libin authored Aug 29, 2019
  
  ff56d131
- 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
- 123 · 11571dba
  hezhen authored Aug 29, 2019
  
  11571dba
- 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