Commits · 439c715f0a809e959663f1f54ee8681b298a309e · youjj / cloud-platform

29 Jul, 2019 25 commits
- 123 · 439c715f
  hezhen authored Jul 29, 2019
  
  439c715f
- 123 · 83dcfa7e
  hezhen authored Jul 29, 2019
  
  83dcfa7e
- 123 · 1e0eabc8
  hezhen authored Jul 29, 2019
  
  1e0eabc8
- 123 · ee300577
  hezhen authored Jul 29, 2019
  
  ee300577
- 122 · 6374c4d9
  hezhen authored Jul 29, 2019
  
  6374c4d9
- 123 · 36067bc7
  hezhen authored Jul 29, 2019
  
  36067bc7
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 3aa9d3cd
  hezhen authored Jul 29, 2019
  
  3aa9d3cd
- 123 · e9e0e483
  hezhen authored Jul 29, 2019
  
  e9e0e483
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 222fdee2
  libin authored Jul 29, 2019
  
  222fdee2
- 会员 · 92d4baff
  libin authored Jul 29, 2019
  
  92d4baff
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · ec7ca7be
  hezhen authored Jul 29, 2019
  
  ec7ca7be
- 123 · bc60da2f
  hezhen authored Jul 29, 2019
  
  bc60da2f
- 会员 · d5028ab7
  libin authored Jul 29, 2019
  
  d5028ab7
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 0d3a6fba
  libin authored Jul 29, 2019
  
  0d3a6fba
- 会员 · fd7009f3
  libin authored Jul 29, 2019
  
  fd7009f3
- 123 · ecd8141b
  hezhen authored Jul 29, 2019
  
  ecd8141b
- 123 · abd35636
  hezhen authored Jul 29, 2019
  
  abd35636
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 53ebb1a8
  hezhen authored Jul 29, 2019
  
  53ebb1a8
- 123 · f69218cc
  hezhen authored Jul 29, 2019
  
  f69218cc
- Merge remote-tracking branch 'origin/base-modify' into base-modify · cae2339f
  libin authored Jul 29, 2019
  
  cae2339f
- 会员 · 1c265729
  libin authored Jul 29, 2019
  
  1c265729
- 支付报接入 · 6dd122ee
  hezhen authored Jul 29, 2019
  
  6dd122ee
- 123 · d8c7dca4
  hezhen authored Jul 29, 2019
  
  d8c7dca4
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · bd9556a3
  hezhen authored Jul 29, 2019
  
  bd9556a3
- 112 · 6795121c
  hezhen authored Jul 29, 2019
  
  6795121c
27 Jul, 2019 15 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 46661c89
  jiaorz authored Jul 27, 2019
  
  46661c89
- 积分规则列表获取问题 · e803dac5
  jiaorz authored Jul 27, 2019
  
  e803dac5
- 钱包提现 · d713dd25
  libin authored Jul 27, 2019
  
  d713dd25
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 2b957d61
  hezhen authored Jul 27, 2019
  
  2b957d61
- 123 · 3780314a
  hezhen authored Jul 27, 2019
  
  3780314a
- 钱包提现 · 4eb56eb4
  libin authored Jul 27, 2019
  
  4eb56eb4
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 48983eaf
  libin authored Jul 27, 2019
  
  48983eaf
- 钱包提现 · 106fad60
  libin authored Jul 27, 2019
  
  106fad60
- 123 · 4b296788
  hezhen authored Jul 27, 2019
  
  4b296788
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · d7fbd133
  hezhen authored Jul 27, 2019
  
  d7fbd133
- 123 · ca4473ce
  hezhen authored Jul 27, 2019
  
  ca4473ce
- 修改实名 · 96183dd5
  hanfeng authored Jul 27, 2019
  
  96183dd5
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · e91db6f5
  hanfeng authored Jul 27, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
```
  e91db6f5
- 修改实名认证 · 4778f8f0
  hanfeng authored Jul 27, 2019
  
  4778f8f0
- 123 · 87a35978
  hezhen authored Jul 27, 2019
  
  87a35978