Commits · cad98eb6efc6a9421d7bb7cf9b83af464f98c60b · youjj / cloud-platform

25 Jul, 2019 16 commits
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · cad98eb6
  hanfeng authored Jul 25, 2019
  
  cad98eb6
- 修改弹窗、精彩活 · 74fb9fef
  hanfeng authored Jul 25, 2019
  
  74fb9fef
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 1ad5cdb1
  libin authored Jul 25, 2019
  
  1ad5cdb1
- 团队成员 · 91d53ff8
  libin authored Jul 25, 2019
  
  91d53ff8
- Merge remote-tracking branch 'origin/base-modify' into base-modify · e81f72a1
  jiaorz authored Jul 25, 2019
  
  e81f72a1
- 注册积分队列 · 0dad10da
  jiaorz authored Jul 25, 2019
  
  0dad10da
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 9f7e0859
  周健威 authored Jul 25, 2019
  
  9f7e0859
- 修改会员订单bug · 26371da1
  周健威 authored Jul 25, 2019
  
  26371da1
- Merge remote-tracking branch 'origin/base-modify' into base-modify · bf7366e6
  jiaorz authored Jul 25, 2019
  
  bf7366e6
- 注册积分队列 · e0e7b086
  jiaorz authored Jul 25, 2019
  
  e0e7b086
- Merge remote-tracking branch 'origin/base-modify' into base-modify · a74cbc88
  libin authored Jul 25, 2019
  
  a74cbc88
- 团队成员 · d933f1f9
  libin authored Jul 25, 2019
  
  d933f1f9
- 修改佣金bug · 6d986790
  周健威 authored Jul 25, 2019
  
  6d986790
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 7f8b6817
  周健威 authored Jul 25, 2019
  
  7f8b6817
- 修改佣金bug · e7b21c01
  周健威 authored Jul 25, 2019
  
  e7b21c01
- 123 · 95134b3f
  hezhen authored Jul 25, 2019
  
  95134b3f
24 Jul, 2019 24 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 5d931fc6
  libin authored Jul 24, 2019
  
  5d931fc6
- 会员 · 1bfe07fa
  libin authored Jul 24, 2019
  
  1bfe07fa
- Merge remote-tracking branch 'origin/base-modify' into base-modify · de0c0d67
  周健威 authored Jul 24, 2019
  
  de0c0d67
- 修改订单项bug · 05d16729
  周健威 authored Jul 24, 2019
  
  05d16729
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · f37a29ef
  hanfeng authored Jul 24, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java
```
  f37a29ef
- 精彩活动后台 · 70a86b26
  hanfeng authored Jul 24, 2019
  
  70a86b26
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 9c834d40
  libin authored Jul 24, 2019
  
  9c834d40
- 会员 · 9f900150
  libin authored Jul 24, 2019
  
  9f900150
- 修改租车bug · 53c23df8
  周健威 authored Jul 24, 2019
  
  53c23df8
- 修改租车bug · 422ce7dd
  周健威 authored Jul 24, 2019
  
  422ce7dd
- 修改租车bug · 9eff815f
  周健威 authored Jul 24, 2019
  
  9eff815f
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 2c16f023
  jiaorz authored Jul 24, 2019
  
  2c16f023
- 注册积分队列 · 0fc78715
  jiaorz authored Jul 24, 2019
  
  0fc78715
- 添加item · 7c60a55a
  周健威 authored Jul 24, 2019
  
  7c60a55a
- 新人有礼活动 · 0dce7a32
  libin authored Jul 24, 2019
  
  0dce7a32
- 新人有礼活动 · 61981bcf
  libin authored Jul 24, 2019
  
  61981bcf
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 48f5ad76
  hezhen authored Jul 24, 2019
  
  48f5ad76
- 123 · 33a78448
  hezhen authored Jul 24, 2019
  
  33a78448
- 帐户清除 · aff0c72e
  libin authored Jul 24, 2019
  
  aff0c72e
- 123 · 3af73120
  hezhen authored Jul 24, 2019
  
  3af73120
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · dc5b09db
  hezhen authored Jul 24, 2019
```
# Conflicts:
#	xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java
```
  dc5b09db
- 123 · 62ac4dbb
  hezhen authored Jul 24, 2019
  
  62ac4dbb
- 帐户清除 · 2e070a13
  libin authored Jul 24, 2019
  
  2e070a13
- 优惠券 · b2824ec4
  libin authored Jul 24, 2019
  
  b2824ec4