Commits · 6eb0c8c85d6043e7cd936d0c8a380f425a40a5bf · youjj / cloud-platform

17 Dec, 2020 5 commits
- Merge branch 'master-chw-price' into dev-chw · 6eb0c8c8
  hezhen authored Dec 17, 2020
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
```
  6eb0c8c8
- 123 · e578a9fc
  hezhen authored Dec 17, 2020
  
  e578a9fc
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 56b8004d
  hezhen authored Dec 17, 2020
  
  56b8004d
- Merge branch 'master-chw-price' into dev-chw · 03b7d60f
  hezhen authored Dec 17, 2020
  
  03b7d60f
- 123 · f0d0c1ab
  hezhen authored Dec 17, 2020
  
  f0d0c1ab
16 Dec, 2020 15 commits
- 123 · 23698fe4
  hezhen authored Dec 16, 2020
  
  23698fe4
- Merge branch 'master-chw' of http://113.105.137.151:22280/youjj/cloud-platform into master-chw · ab49459e
  hezhen authored Dec 16, 2020
  
  ab49459e
- Merge branch 'master-chw-bug' into dev-chw · 7b9fe2fe
  unset authored Dec 16, 2020
  
  7b9fe2fe
- 修改banner接口 · e94d64a3
  unset authored Dec 16, 2020
  
  e94d64a3
- Merge branch 'master-chw-bug' into dev-chw · 71265da0
  unset authored Dec 16, 2020
  
  71265da0
- 修改banner接口 · b2b5db15
  unset authored Dec 16, 2020
  
  b2b5db15
- Merge branch 'master-chw' into dev-chw · cbf40948
  hezhen authored Dec 16, 2020
  
  cbf40948
- 123 · ec947583
  hezhen authored Dec 16, 2020
  
  ec947583
- Merge branch 'master-chw' into dev-chw · 43be47e0
  hezhen authored Dec 16, 2020
  
  43be47e0
- 123 · 055848fb
  hezhen authored Dec 16, 2020
  
  055848fb
- Merge branch 'master-chw' into dev-chw · 4ae949ab
  hezhen authored Dec 16, 2020
  
  4ae949ab
- 123 · af4273fa
  hezhen authored Dec 16, 2020
  
  af4273fa
- Merge branch 'master-chw' into dev-chw · 1d8f2892
  hezhen authored Dec 16, 2020
  
  1d8f2892
- 123 · ef098ff0
  hezhen authored Dec 16, 2020
  
  ef098ff0
- Merge branch 'master-chw' of http://113.105.137.151:22280/youjj/cloud-platform into master-chw · 7e6b74e3
  hezhen authored Dec 16, 2020
  
  7e6b74e3
15 Dec, 2020 4 commits
- Merge branch 'master-chw-xsl' into dev-chw · 62fa2720
  xiaosl authored Dec 15, 2020
  
  62fa2720
- 屏蔽 · 9ec7ac2b
  xiaosl authored Dec 15, 2020
  
  9ec7ac2b
- Merge branch 'master-chw' into dev-chw · 515abd96
  hezhen authored Dec 15, 2020
  
  515abd96
- 123 · 888b4690
  hezhen authored Dec 15, 2020
  
  888b4690
14 Dec, 2020 16 commits
- Merge branch 'master-chw' into dev-chw · 40ec0638
  hezhen authored Dec 14, 2020
  
  40ec0638
- 123 · 71e97d78
  hezhen authored Dec 14, 2020
  
  71e97d78
- Merge branch 'master-chw' into dev-chw · 5b4fd265
  hezhen authored Dec 14, 2020
  
  5b4fd265
- 123 · c78c3118
  hezhen authored Dec 14, 2020
  
  c78c3118
- Merge branch 'master-chw' into dev-chw · 5b0e2824
  hezhen authored Dec 14, 2020
  
  5b0e2824
- 123 · c254a778
  hezhen authored Dec 14, 2020
  
  c254a778
- 123 · 1a3e1b14
  hezhen authored Dec 14, 2020
  
  1a3e1b14
- Merge branch 'master-chw' into dev-chw · 3b7c2b3e
  hezhen authored Dec 14, 2020
  
  3b7c2b3e
- 123 · 08b45d46
  hezhen authored Dec 14, 2020
  
  08b45d46
- Merge branch 'master-chw' into dev-chw · 3d5f4bb3
  hezhen authored Dec 14, 2020
  
  3d5f4bb3
- 123 · 052f9064
  hezhen authored Dec 14, 2020
  
  052f9064
- Merge branch 'master-chw' into dev-chw · 3d5f48aa
  hezhen authored Dec 14, 2020
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishMapper.xml
```
  3d5f48aa
- 123 · 5c86b86f
  hezhen authored Dec 14, 2020
  
  5c86b86f
- Merge branch 'master-chw' into dev-chw · 4af0708c
  hezhen authored Dec 14, 2020
  
  4af0708c
- 123 · 6e56256d
  hezhen authored Dec 14, 2020
  
  6e56256d
- Merge branch 'master-chw' into dev-chw · ce63d50a
  hezhen authored Dec 14, 2020
  
  ce63d50a