Commits · a04dbc862dd4fc74470d4d4c7ec31ba75d65d30f · youjj / cloud-platform

17 Dec, 2020 24 commits
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · a04dbc86
  unset authored Dec 17, 2020
  
  a04dbc86
- Merge branch 'master-chw-bug' into dev-chw · 953f42e8
  unset authored Dec 17, 2020
  
  953f42e8
- Merge branch 'master-chw-price' into dev-chw · 179c53b6
  hezhen authored Dec 17, 2020
  
  179c53b6
- 改为预授权支付 · 784f1ce5
  unset authored Dec 17, 2020
  
  784f1ce5
- 123 · cf61760e
  hezhen authored Dec 17, 2020
  
  cf61760e
- Merge branch 'master-chw-price' into dev-chw · 923ff4b7
  hezhen authored Dec 17, 2020
  
  923ff4b7
- 123 · eb94c37b
  hezhen authored Dec 17, 2020
  
  eb94c37b
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 76d55aaa
  hezhen authored Dec 17, 2020
  
  76d55aaa
- Merge branch 'master-chw-price' into dev-chw · 100ce890
  hezhen authored Dec 17, 2020
  
  100ce890
- 123 · f0edb061
  hezhen authored Dec 17, 2020
  
  f0edb061
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · 0e87c96b
  unset authored Dec 17, 2020
  
  0e87c96b
- Merge branch 'master-chw-bug' into dev-chw · e123b629
  unset authored Dec 17, 2020
```
# Conflicts:
#	xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/ArticleAdminController.java
```
  e123b629
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 9ec039fe
  hezhen authored Dec 17, 2020
  
  9ec039fe
- Merge branch 'master-chw-price' into dev-chw · babe0772
  hezhen authored Dec 17, 2020
  
  babe0772
- 123 · 25b3590b
  hezhen authored Dec 17, 2020
  
  25b3590b
- 修改banner接口 · d6923acd
  unset authored Dec 17, 2020
  
  d6923acd
- 修改banner接口 · 9555844e
  unset authored Dec 17, 2020
  
  9555844e
- Merge branch 'master-chw-bug' into dev-chw · e920d6ad
  unset authored Dec 17, 2020
  
  e920d6ad
- 修改banner接口 · b509307a
  unset authored Dec 17, 2020
  
  b509307a
- 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 1 commit
- Merge branch 'master-chw-xsl' into dev-chw · 62fa2720
  xiaosl authored Dec 15, 2020
  
  62fa2720