Commits · 56e57d3e0e06bec1b5ddd6e4b6da21b195974200 · youjj / cloud-platform

08 Jan, 2020 6 commits
- Merge branch 'wallet_detail' into dev · 56e57d3e
  libin authored Jan 08, 2020
  
  56e57d3e
- 会员新增前后空格处理 · 2424713b
  libin authored Jan 08, 2020
  
  2424713b
- 会员新增前后空格处理 · a130fc2a
  libin authored Jan 08, 2020
  
  a130fc2a
- Merge branch 'master' into wallet_detail · fb7844a3
  libin authored Jan 08, 2020
  
  fb7844a3
- Merge remote-tracking branch 'origin/dev' into dev · 4f9d00c3
  libin authored Jan 08, 2020
  
  4f9d00c3
- Merge branches 'member_statistics' and 'wallet_detail' into dev · 960413c2
  libin authored Jan 08, 2020
  
  960413c2
07 Jan, 2020 7 commits
- Merge branch 'upd-staff-appShareholderDetail' into dev · fd4e08f0
  zuoyh authored Jan 07, 2020
  
  fd4e08f0
- Merge remote-tracking branch 'origin/dev' into dev · 8b9d8fbe
  zuoyh authored Jan 07, 2020
  
  8b9d8fbe
- 股东变更時間修改 · 75eebf6a
  zuoyh authored Jan 07, 2020
  
  75eebf6a
- 删除无用项目 · 44495cba
  libin authored Jan 07, 2020
  
  44495cba
- Merge branch 'master-vehicle-count-bug' · 7e60347b
  jiaorz authored Jan 07, 2020
  
  7e60347b
- Merge branch 'wallet_detail' into dev · fcc0acde
  libin authored Jan 07, 2020
  
  fcc0acde
- 提现方式调整（1：线下自动 2：线下手动 3：线上自动） · 6e4bbce0
  libin authored Jan 07, 2020
  
  6e4bbce0
06 Jan, 2020 18 commits
- 会员导入添加核销时间 · 4016e9c7
  libin authored Jan 06, 2020
  
  4016e9c7
- Merge branch 'member_statistics' into dev · 6e9e464f
  libin authored Jan 06, 2020
```
# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
```
  6e9e464f
- 会员统计 · 132197a5
  libin authored Jan 06, 2020
  
  132197a5
- Merge branch 'master-invoice-modular' into dev · 6dc5a1c3
  jiaorz authored Jan 06, 2020
  
  6dc5a1c3
- 取消下单 · 5e5a073f
  jiaorz authored Jan 06, 2020
  
  5e5a073f
- Merge branch 'master-order' into dev · e3e3910a
  jiaorz authored Jan 06, 2020
  
  e3e3910a
- 取消下单 · 03e07a5b
  jiaorz authored Jan 06, 2020
  
  03e07a5b
- 取消下单 · 3f1b6667
  jiaorz authored Jan 06, 2020
  
  3f1b6667
- 取消下单 · 8ff521e7
  jiaorz authored Jan 06, 2020
  
  8ff521e7
- Merge remote-tracking branch 'origin/dev' into dev · 899e263e
  jiaorz authored Jan 06, 2020
  
  899e263e
- Merge branch 'master-order' into dev · 2b2a38af
  jiaorz authored Jan 06, 2020
  
  2b2a38af
- 取消下单 · 3b50a704
  jiaorz authored Jan 06, 2020
  
  3b50a704
- Merge branch 'wallet_detail' into dev · b4dc69de
  libin authored Jan 06, 2020
  
  b4dc69de
- 消费明细 · 13b8acdb
  libin authored Jan 06, 2020
  
  13b8acdb
- 手机号判断 · 31e86557
  libin authored Jan 06, 2020
  
  31e86557
- Merge branch 'wallet_detail' into dev · cc594531
  libin authored Jan 06, 2020
  
  cc594531
- 佣金明细 · 84e2af4d
  libin authored Jan 06, 2020
  
  84e2af4d
- 车辆统计修改导出数据 · 76cd3c2e
  jiaorz authored Jan 06, 2020
  
  76cd3c2e
03 Jan, 2020 9 commits
- Merge branch 'wallet_detail' into dev · 0aa1ec71
  libin authored Jan 03, 2020
  
  0aa1ec71
- 收益明细 · e4a8452c
  libin authored Jan 03, 2020
  
  e4a8452c
- Merge branch 'master-vehicle-count-bug' into dev · f3ea8ae0
  jiaorz authored Jan 03, 2020
  
  f3ea8ae0
- 车辆统计修改导出数据 · 183614b7
  jiaorz authored Jan 03, 2020
  
  183614b7
- Merge branch 'master-vehicle-count-bug' into dev · d8041988
  jiaorz authored Jan 03, 2020
  
  d8041988
- 车辆统计修改导出数据 · 545f48b2
  jiaorz authored Jan 03, 2020
  
  545f48b2
- Merge branch 'master-vehicle-count-bug' into dev · ea98f444
  jiaorz authored Jan 03, 2020
  
  ea98f444
- 车辆统计修改导出数据 · f4a481f5
  jiaorz authored Jan 03, 2020
  
  f4a481f5
- Merge remote-tracking branch 'origin/dev' into dev · 6e1a25e3
  jiaorz authored Jan 03, 2020
```
# Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java
```
  6e1a25e3