Commits · c6391744fde2873a7fa0ad0abf77cd6ed7d7088f · youjj / cloud-platform

04 Dec, 2020 20 commits
- 修改bug · c6391744
  周健威 authored Dec 04, 2020
  
  c6391744
- 修改bug · 15769e6f
  周健威 authored Dec 04, 2020
  
  15769e6f
- 修改bug · fe0e049f
  周健威 authored Dec 04, 2020
  
  fe0e049f
- Merge remote-tracking branch 'origin/feature_chw_zjw' into feature_chw_zjw · 36172dce
  周健威 authored Dec 04, 2020
  
  36172dce
- 修改bug · 62604c13
  周健威 authored Dec 04, 2020
  
  62604c13
- Merge branch 'feature_chw_zjw' of... · dd9571ee
  hezhen authored Dec 04, 2020
```
Merge branch 'feature_chw_zjw' of http://113.105.137.151:22280/youjj/cloud-platform into feature_chw_zjw
```
  dd9571ee
- 123 · ca499531
  hezhen authored Dec 04, 2020
  
  ca499531
- 修改bug · efc12140
  周健威 authored Dec 04, 2020
  
  efc12140
- Merge remote-tracking branch 'origin/feature_chw_zjw' into feature_chw_zjw · 1ba0b152
  周健威 authored Dec 04, 2020
  
  1ba0b152
- 修改bug · 5ac1a6d0
  周健威 authored Dec 04, 2020
  
  5ac1a6d0
- 修改分账 · e66229b1
  hezhen authored Dec 04, 2020
  
  e66229b1
- 修改保险 · 9aea141a
  周健威 authored Dec 04, 2020
  
  9aea141a
- 修改保险 · 524fdb09
  周健威 authored Dec 04, 2020
  
  524fdb09
- 修改保险 · f0884c37
  周健威 authored Dec 04, 2020
  
  f0884c37
- Merge remote-tracking branch 'origin/feature_chw_zjw' into feature_chw_zjw · 67c8ee5d
  周健威 authored Dec 04, 2020
  
  67c8ee5d
- 修改保险 · 2b00cbc1
  周健威 authored Dec 04, 2020
  
  2b00cbc1
- 添加休眠 · f6576e6c
  hezhen authored Dec 04, 2020
  
  f6576e6c
- Merge remote-tracking branch 'origin/feature_chw_zjw' into feature_chw_zjw · 7091e9b5
  周健威 authored Dec 04, 2020
  
  7091e9b5
- 修改保险 · e8bb2073
  周健威 authored Dec 04, 2020
  
  e8bb2073
- 修改保险分账 · 8a267d5a
  hezhen authored Dec 04, 2020
  
  8a267d5a
03 Dec, 2020 9 commits
- 修改保险 · 1885f40c
  周健威 authored Dec 03, 2020
  
  1885f40c
- 修改保险 · 0555e901
  周健威 authored Dec 03, 2020
  
  0555e901
- 修改保险 · 797b103c
  周健威 authored Dec 03, 2020
  
  797b103c
- 修改保险 · ed928884
  周健威 authored Dec 03, 2020
  
  ed928884
- 修改保险 · 2ce97581
  周健威 authored Dec 03, 2020
  
  2ce97581
- 修改保险 · d6170f18
  周健威 authored Dec 03, 2020
  
  d6170f18
- 修改保险 · c94394b0
  周健威 authored Dec 03, 2020
  
  c94394b0
- Merge remote-tracking branch 'origin/feature_chw_zjw' into feature_chw_zjw · 1c3a1fac
  周健威 authored Dec 03, 2020
  
  1c3a1fac
- 修改保险 · b6d9ccd4
  周健威 authored Dec 03, 2020
  
  b6d9ccd4
02 Dec, 2020 3 commits
- 修改保险分账 · 671aaf74
  hezhen authored Dec 02, 2020
  
  671aaf74
- 修改保险 · a0c03fec
  周健威 authored Dec 02, 2020
  
  a0c03fec
- 修改保险 · c639ac78
  周健威 authored Dec 02, 2020
  
  c639ac78
01 Dec, 2020 2 commits
- 添加出游人接口 · ea0b9ff9
  周健威 authored Dec 01, 2020
  
  ea0b9ff9
- 添加出游人接口 · 53515f38
  周健威 authored Dec 01, 2020
  
  53515f38
30 Nov, 2020 1 commit
- 添加订单参数 · bded309f
  周健威 authored Nov 30, 2020
  
  bded309f
28 Nov, 2020 2 commits
- Merge branch 'master-chw' into feature_chw_zjw · 843bdfc0
  周健威 authored Nov 28, 2020
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
```
  843bdfc0
- 添加人身保险 · 7cdca520
  周健威 authored Nov 28, 2020
  
  7cdca520
27 Nov, 2020 3 commits
- Merge branch 'dev-chw' into master-chw · b8b5890d
  周健威 authored Nov 27, 2020
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java
```
  b8b5890d
- Merge branch 'feature_chw_zjw2' into dev-chw · 851b35b1
  周健威 authored Nov 27, 2020
  
  851b35b1
- 修改bug · 1485e218
  周健威 authored Nov 27, 2020
  
  1485e218